You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/12/11 00:00:16 UTC
svn commit: r485298 - in /webservices/muse/trunk: modules/osgi-bundles/
modules/osgi-bundles/muse-core/resources/META-INF/
modules/osgi-bundles/muse-util-all/resources/META-INF/
modules/osgi-bundles/muse-wsa-soap/resources/META-INF/ modules/osgi-bundle...
Author: danj
Date: Sun Dec 10 15:00:15 2006
New Revision: 485298
URL: http://svn.apache.org/viewvc?view=rev&rev=485298
Log:
Joel H.'s fixes for MUSE-157 and MUSE-158
Modified:
webservices/muse/trunk/modules/osgi-bundles/muse-core/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-util-all/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsa-soap/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-api/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-impl/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-api/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-impl/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-api/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-impl/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsn-api/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsn-impl/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/src/org/apache/muse/osgi/wsrf/WSRFImplementationService.java
webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/src/org/apache/muse/osgi/wsrf/impl/WSRFImplementationService.java
webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-rmd/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsx-api/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/muse-wsx-impl/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/osgi-bundles/pom.xml
webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml
webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/config/MANIFEST.MF
webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml
webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/config/MANIFEST.MF
webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml
webservices/muse/trunk/samples/eclipse-osgi/wsrf/config/MANIFEST.MF
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-core/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-core/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-core/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-core/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Muse Core Engine Plug-in
-Bundle-SymbolicName: muse.core
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Require-Bundle: muse.util.all,
- muse.wsa.soap
-Import-Package: javax.wsdl,
- javax.wsdl.extensions,
- javax.wsdl.factory,
- javax.wsdl.xml,
- javax.xml.namespace,
- javax.xml.soap,
- org.apache.xml.serialize,
- org.osgi.framework;version="1.3.0",
- org.w3c.dom
-Eclipse-LazyStart: false
-Export-Package: org.apache.muse.core,
- org.apache.muse.core.descriptor,
- org.apache.muse.core.platform,
- org.apache.muse.core.proxy,
- org.apache.muse.core.routing,
- org.apache.muse.core.serializer,
- org.apache.muse.ws.wsdl
-Bundle-ClassPath: .
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Muse Core Engine Plug-in
+Bundle-SymbolicName: muse.core
+Bundle-Version: 2.1.0
+Bundle-Localization: plugin
+Require-Bundle: muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
+Import-Package: javax.wsdl,
+ javax.wsdl.extensions,
+ javax.wsdl.factory,
+ javax.wsdl.xml,
+ javax.xml.namespace,
+ javax.xml.soap,
+ org.apache.xml.serialize,
+ org.osgi.framework;version="1.3.0",
+ org.w3c.dom
+Eclipse-LazyStart: false
+Export-Package: org.apache.muse.core;version="2.1.0",
+ org.apache.muse.core.descriptor;version="2.1.0",
+ org.apache.muse.core.platform;version="2.1.0",
+ org.apache.muse.core.proxy;version="2.1.0",
+ org.apache.muse.core.routing;version="2.1.0",
+ org.apache.muse.core.serializer;version="2.1.0",
+ org.apache.muse.ws.wsdl;version="2.1.0"
+Bundle-ClassPath: .
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-util-all/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-util-all/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-util-all/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-util-all/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,14 +9,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse Utilities Plug-in
Bundle-SymbolicName: muse.util.all
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-Localization: plugin
Require-Bundle: org.apache.xerces
-Export-Package: org.apache.muse.util,
- org.apache.muse.util.messages,
- org.apache.muse.util.osgi,
- org.apache.muse.util.uuid,
- org.apache.muse.util.xml
+Export-Package: org.apache.muse.util;version="2.1.0",
+ org.apache.muse.util.messages;version="2.1.0",
+ org.apache.muse.util.osgi;version="2.1.0",
+ org.apache.muse.util.uuid;version="2.1.0",
+ org.apache.muse.util.xml;version="2.1.0"
Import-Package: org.apache.xml.serialize,
org.apache.xpath,
org.apache.xpath.axes,
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsa-soap/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsa-soap/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsa-soap/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsa-soap/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,12 +9,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-Addressing and SOAP Plug-in
Bundle-SymbolicName: muse.wsa.soap
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.addressing,org.apache.muse.ws.addre
- ssing.soap
-Require-Bundle: muse.util.all
+Export-Package: org.apache.muse.ws.addressing;version="2.1.0",
+ org.apache.muse.ws.addressing.soap;version="2.1.0"
+Require-Bundle: muse.util.all;bundle-version="2.1.0"
Import-Package: javax.xml.namespace,
org.osgi.framework;version="1.3.0",
org.w3c.dom
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-api/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-api/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-api/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-api/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,14 +9,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WSDM MUWS 1.1 Advertisement API Plug-in
Bundle-SymbolicName: muse.wsdm.muws.adv.api
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.dm.muws.adv
+Export-Package: org.apache.muse.ws.dm.muws.adv;version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0",
org.w3c.dom, javax.xml.namespace
-Require-Bundle: muse.core,
- muse.util.all,
- muse.wsa.soap
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
Bundle-Activator: org.apache.muse.osgi.ws.dm.muws.adv.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-impl/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-impl/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-impl/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-adv-impl/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WSDM MUWS 1.1 Advertisement Implementation Plug-in
Bundle-SymbolicName: muse.wsdm.muws.adv.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.dm.muws.adv.impl
-Require-Bundle: muse.wsdm.muws.adv.api,
- muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsrf.api,
- muse.wsrf.impl,
- muse.wsn.api,
- muse.wsn.impl,
- muse.wsdm.wef.api,
- muse.wsdm.wef.impl,
- muse.wsdm.muws.api,
- muse.wsdm.muws.impl,
- muse.osgi.core
+Export-Package: org.apache.muse.ws.dm.muws.adv.impl;version="2.1.0"
+Require-Bundle: muse.wsdm.muws.adv.api;bundle-version="2.1.0",
+ muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.wsrf.api;bundle-version="2.1.0",
+ muse.wsrf.impl;bundle-version="2.1.0",
+ muse.wsn.api;bundle-version="2.1.0",
+ muse.wsn.impl;bundle-version="2.1.0",
+ muse.wsdm.wef.api;bundle-version="2.1.0",
+ muse.wsdm.wef.impl;bundle-version="2.1.0",
+ muse.wsdm.muws.api;bundle-version="2.1.0",
+ muse.wsdm.muws.impl;bundle-version="2.1.0",
+ muse.osgi.core;bundle-version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0",
org.w3c.dom, javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.ws.dm.muws.adv.impl.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-api/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-api/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-api/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-api/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,15 +9,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WSDM MUWS 1.1 API Plug-in
Bundle-SymbolicName: muse.wsdm.muws.api
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.dm.muws,org.apache.muse.ws.dm.muws.
- ext,org.apache.muse.ws.dm.muws.ext.faults
-Require-Bundle: muse.wsa.soap,
- muse.util.all,
- muse.core,
- muse.wsrf.api
+Export-Package: org.apache.muse.ws.dm.muws;version="2.1.0",
+ org.apache.muse.ws.dm.muws.ext;version="2.1.0",
+ org.apache.muse.ws.dm.muws.ext.faults;version="2.1.0"
+Require-Bundle: muse.wsa.soap;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.core;bundle-version="2.1.0",
+ muse.wsrf.api;bundle-version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0",
org.w3c.dom, javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.wsdm.muws.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-impl/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-impl/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-impl/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-muws-impl/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WSDM MUWS 1.1 Implementation Plug-in
Bundle-SymbolicName: muse.wsdm.muws.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.dm.muws.impl,
- org.apache.muse.ws.dm.muws.remote
-Require-Bundle: muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsdm.muws.api,
- muse.wsrf.api,
- muse.wsrf.impl,
- muse.osgi.core
+Export-Package: org.apache.muse.ws.dm.muws.impl;version="2.1.0",
+ org.apache.muse.ws.dm.muws.remote;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.wsdm.muws.api;bundle-version="2.1.0",
+ muse.wsrf.api;bundle-version="2.1.0",
+ muse.wsrf.impl;bundle-version="2.1.0",
+ muse.osgi.core;bundle-version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0", javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.wsdm.muws.impl.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-api/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-api/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-api/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-api/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WSDM Event Format 1.1 API Plug-in
Bundle-SymbolicName: muse.wsdm.wef.api
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.dm.muws.events
-Require-Bundle: muse.util.all,
- muse.core,
- muse.wsa.soap
+Export-Package: org.apache.muse.ws.dm.muws.events;version="2.1.0"
+Require-Bundle: muse.util.all;bundle-version="2.1.0",
+ muse.core;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
Import-Package: javax.xml.namespace
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-impl/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-impl/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-impl/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsdm-wef-impl/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WSDM Event Format 1.1 Implementation Plug-in
Bundle-SymbolicName: muse.wsdm.wef.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Require-Bundle: muse.wsdm.wef.api,
- muse.util.all,
- muse.core,
- muse.wsa.soap
-Export-Package: org.apache.muse.ws.dm.muws.events.impl
+Require-Bundle: muse.wsdm.wef.api;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.core;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
+Export-Package: org.apache.muse.ws.dm.muws.events.impl;version="2.1.0"
Import-Package: javax.xml.namespace
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsn-api/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsn-api/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsn-api/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsn-api/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,15 +9,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-Notification 1.3 API Plug-in
Bundle-SymbolicName: muse.wsn.api
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.notification,org.apache.muse.ws.not
- ification.faults,org.apache.muse.ws.notification.topics
-Require-Bundle: muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsrf.api
+Export-Package: org.apache.muse.ws.notification;version="2.1.0",
+ org.apache.muse.ws.notification.faults;version="2.1.0",
+ org.apache.muse.ws.notification.topics;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.wsrf.api;bundle-version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0",
org.w3c.dom, javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.wsn.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsn-impl/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsn-impl/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsn-impl/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsn-impl/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-Notification 1.3 Implementation Plug-in
Bundle-SymbolicName: muse.wsn.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Require-Bundle: muse.wsrf.api,
- muse.wsrf.impl,
- muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.osgi.core,
- muse.wsn.api
-Export-Package: org.apache.muse.ws.notification.impl,
- org.apache.muse.ws.notification.properties,
- org.apache.muse.ws.notification.remote,
- org.apache.muse.ws.notification.topics.impl
+Require-Bundle: muse.wsrf.api;bundle-version="2.1.0",
+ muse.wsrf.impl;bundle-version="2.1.0",
+ muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.osgi.core;bundle-version="2.1.0",
+ muse.wsn.api;bundle-version="2.1.0"
+Export-Package: org.apache.muse.ws.notification.impl;version="2.1.0",
+ org.apache.muse.ws.notification.properties;version="2.1.0",
+ org.apache.muse.ws.notification.remote;version="2.1.0",
+ org.apache.muse.ws.notification.topics.impl;version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0", javax.xml.namespace
Eclipse-LazyStart: false
Bundle-Activator: org.apache.muse.osgi.wsn.impl.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,25 +9,35 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-ResourceFramework 1.2 API Plug-in
Bundle-SymbolicName: muse.wsrf.api
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.resource,org.apache.muse.ws.resourc
- e.basefaults,org.apache.muse.ws.resource.ext,org.apache.muse.ws.resou
- rce.ext.faults,org.apache.muse.ws.resource.faults,org.apache.muse.ws.
- resource.lifetime,org.apache.muse.ws.resource.lifetime.faults,org.apa
- che.muse.ws.resource.metadata,org.apache.muse.ws.resource.metadata.fa
- ults,org.apache.muse.ws.resource.properties,org.apache.muse.ws.resour
- ce.properties.get,org.apache.muse.ws.resource.properties.get.ext,org.
- apache.muse.ws.resource.properties.get.faults,org.apache.muse.ws.reso
- urce.properties.listeners,org.apache.muse.ws.resource.properties.quer
- y,org.apache.muse.ws.resource.properties.query.faults,org.apache.muse
- .ws.resource.properties.schema,org.apache.muse.ws.resource.properties
- .schema.faults,org.apache.muse.ws.resource.properties.set,org.apache.
- muse.ws.resource.properties.set.ext,org.apache.muse.ws.resource.prope
- rties.set.faults,org.apache.muse.ws.resource.sg,org.apache.muse.ws.re
- source.sg.faults
-Require-Bundle: muse.core,muse.util.all,muse.wsa.soap
+Export-Package: org.apache.muse.ws.resource;version="2.1.0",
+ org.apache.muse.ws.resource.basefaults;version="2.1.0",
+ org.apache.muse.ws.resource.ext;version="2.1.0",
+ org.apache.muse.ws.resource.ext.faults;version="2.1.0",
+ org.apache.muse.ws.resource.faults;version="2.1.0",
+ org.apache.muse.ws.resource.lifetime;version="2.1.0",
+ org.apache.muse.ws.resource.lifetime.faults;version="2.1.0",
+ org.apache.muse.ws.resource.metadata;version="2.1.0",
+ org.apache.muse.ws.resource.metadata.faults;version="2.1.0",
+ org.apache.muse.ws.resource.properties;version="2.1.0",
+ org.apache.muse.ws.resource.properties.get;version="2.1.0",
+ org.apache.muse.ws.resource.properties.get.ext;version="2.1.0",
+ org.apache.muse.ws.resource.properties.get.faults;version="2.1.0",
+ org.apache.muse.ws.resource.properties.listeners;version="2.1.0",
+ org.apache.muse.ws.resource.properties.query;version="2.1.0",
+ org.apache.muse.ws.resource.properties.query.faults;version="2.1.0",
+ org.apache.muse.ws.resource.properties.schema;version="2.1.0",
+ org.apache.muse.ws.resource.properties.schema.faults;version="2.1.0",
+ org.apache.muse.ws.resource.properties.set;version="2.1.0",
+ org.apache.muse.ws.resource.properties.set.ext;version="2.1.0",
+ org.apache.muse.ws.resource.properties.set.faults;version="2.1.0",
+ org.apache.muse.ws.resource.sg;version="2.1.0",
+ org.apache.muse.ws.resource.sg.faults;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0",
org.w3c.dom,javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.wsrf.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/src/org/apache/muse/osgi/wsrf/WSRFImplementationService.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/src/org/apache/muse/osgi/wsrf/WSRFImplementationService.java?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/src/org/apache/muse/osgi/wsrf/WSRFImplementationService.java (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-api/src/org/apache/muse/osgi/wsrf/WSRFImplementationService.java Sun Dec 10 15:00:15 2006
@@ -32,6 +32,9 @@
private static final String IMPLEMENTATION_NAME = "wsrf";
+ private static final String[] RESOURCE_IMPLEMENTATIONS =
+ {"org.apache.muse.ws.resource.sg.MembershipContentRule"};
+
private static final String[] RESOURCE_SPECS = {
"WS-BaseFaults-1_2.xsd",
"WS-Resource-1_2.wsdl",
@@ -51,6 +54,7 @@
public WSRFImplementationService(Bundle bundle){
super(bundle);
this.implementationName = IMPLEMENTATION_NAME;
+ this.resourceImplementationNames = RESOURCE_IMPLEMENTATIONS;
this.resourceSpecNames = RESOURCE_SPECS;
}
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-ResourceFramework 1.2 Implementation Plug-in
Bundle-SymbolicName: muse.wsrf.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.resource.impl,
- org.apache.muse.ws.resource.lifetime.impl,
- org.apache.muse.ws.resource.metadata.impl,
- org.apache.muse.ws.resource.properties.get.impl,
- org.apache.muse.ws.resource.properties.impl,
- org.apache.muse.ws.resource.properties.query.impl,
- org.apache.muse.ws.resource.properties.schema.impl,
- org.apache.muse.ws.resource.properties.set.impl,
- org.apache.muse.ws.resource.remote,
- org.apache.muse.ws.resource.sg.impl,
- org.apache.muse.ws.resource.sg.remote
-Require-Bundle: muse.core,
- muse.wsa.soap,
- muse.wsrf.api,
- muse.util.all,
- muse.osgi.core
+Export-Package: org.apache.muse.ws.resource.impl;version="2.1.0",
+ org.apache.muse.ws.resource.lifetime.impl;version="2.1.0",
+ org.apache.muse.ws.resource.metadata.impl;version="2.1.0",
+ org.apache.muse.ws.resource.properties.get.impl;version="2.1.0",
+ org.apache.muse.ws.resource.properties.impl;version="2.1.0",
+ org.apache.muse.ws.resource.properties.query.impl;version="2.1.0",
+ org.apache.muse.ws.resource.properties.schema.impl;version="2.1.0",
+ org.apache.muse.ws.resource.properties.set.impl;version="2.1.0",
+ org.apache.muse.ws.resource.remote;version="2.1.0",
+ org.apache.muse.ws.resource.sg.impl;version="2.1.0",
+ org.apache.muse.ws.resource.sg.remote;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.wsrf.api;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.osgi.core;bundle-version="2.1.0"
Import-Package: javax.wsdl,
javax.wsdl.extensions,
javax.wsdl.extensions.http,
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/src/org/apache/muse/osgi/wsrf/impl/WSRFImplementationService.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/src/org/apache/muse/osgi/wsrf/impl/WSRFImplementationService.java?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/src/org/apache/muse/osgi/wsrf/impl/WSRFImplementationService.java (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-impl/src/org/apache/muse/osgi/wsrf/impl/WSRFImplementationService.java Sun Dec 10 15:00:15 2006
@@ -51,8 +51,8 @@
"org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination",
"org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination",
"org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability",
- "org.apache.muse.ws.resource.properties.get.impl.SimpleSetCapability",
- "org.apache.muse.ws.resource.properties.get.impl.SimpleQueryCapability",
+ "org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability",
+ "org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability",
"org.apache.muse.ws.metadata.impl.SimpleMetadataExchange",
"org.apache.muse.ws.resource.metadata.impl.SimpleResourceMetadataCapability",
"org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup",
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-rmd/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-rmd/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-rmd/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsrf-rmd/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Muse WS-ResourceMetadataDescriptor 1.0 CD Plug-in
-Bundle-SymbolicName: muse.wsrf.rmd
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Bundle-ClassPath: .
-Export-Package: org.apache.ws.resource.properties.metadata.ext
-Require-Bundle: muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsrf.api,
- muse.wsrf.impl,
- muse.wsx.api,
- muse.wsx.impl
-Import-Package: javax.xml.namespace
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Muse WS-ResourceMetadataDescriptor 1.0 CD Plug-in
+Bundle-SymbolicName: muse.wsrf.rmd
+Bundle-Version: 2.1.0
+Bundle-Localization: plugin
+Bundle-ClassPath: .
+Export-Package: org.apache.ws.resource.properties.metadata.ext;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.wsrf.api;bundle-version="2.1.0",
+ muse.wsrf.impl;bundle-version="2.1.0",
+ muse.wsx.api;bundle-version="2.1.0",
+ muse.wsx.impl;bundle-version="2.1.0"
+Import-Package: javax.xml.namespace
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsx-api/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsx-api/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsx-api/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsx-api/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -9,11 +9,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-MetadataExchange 09/2004 API Plug-in
Bundle-SymbolicName: muse.wsx.api
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.metadata
-Require-Bundle: muse.core,muse.util.all,muse.wsa.soap
+Export-Package: org.apache.muse.ws.metadata;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
Import-Package: org.osgi.framework;version="1.3.0",
org.w3c.dom, javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.wsx.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-wsx-impl/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-wsx-impl/resources/META-INF/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-wsx-impl/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-wsx-impl/resources/META-INF/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Muse WS-MetadataExchange 09/2004 Implementation Plug-in
Bundle-SymbolicName: muse.wsx.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
-Export-Package: org.apache.muse.ws.metadata.impl
-Require-Bundle: muse.core,
- muse.wsx.api,
- muse.wsa.soap,
- muse.util.all,
- muse.osgi.core
+Export-Package: org.apache.muse.ws.metadata.impl;version="2.1.0"
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.wsx.api;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.osgi.core;bundle-version="2.1.0"
Import-Package: javax.xml.soap,
org.osgi.framework;version="1.3.0", javax.xml.namespace
Bundle-Activator: org.apache.muse.osgi.wsx.impl.Activator
Modified: webservices/muse/trunk/modules/osgi-bundles/pom.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/pom.xml?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/pom.xml (original)
+++ webservices/muse/trunk/modules/osgi-bundles/pom.xml Sun Dec 10 15:00:15 2006
@@ -35,6 +35,7 @@
<module>muse-wsrf-rmd</module>
<module>muse-wsx-api</module>
<module>muse-wsx-impl</module>
+ <module>muse-complete</module>
</modules>
<build>
<resources>
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml Sun Dec 10 15:00:15 2006
@@ -1,176 +1,268 @@
-<?xml version="1.0"?>
-<project name="WSN Consumer OSGi Example" default="plugins">
-
- <target name="init">
- <basename property="NAME" file="${basedir}"/>
- <property name="MUSE_HOME" value="../../.."/>
- <property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
- <property name="BUILD_DIR" value="build"/>
- <property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
- <property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
- <property name="OSGI_INF_DIR" value="${BUILD_DIR}/OSGI-INF"/>
- <property name="META_INF_DIR" value="${BUILD_DIR}/META-INF"/>
- <property name="PLUGINS_DIR" value="${basedir}/plugins"/>
- <property name="PLUGIN_DIR" value="${PLUGINS_DIR}/${NAME}"/>
-
- <property name="WSN_CONSUMER_SAMPLE_DIR" value="../../wsn-consumer"/>
- <property name="JAR_FILE" value="${BUILD_DIR}/${NAME}.jar"/>
-
- <path id="muse.class.path">
- <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/core/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/osgi/core">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/eclipse-osgi">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/common">
- <include name="*.jar"/>
- </fileset>
- </path>
- </target>
-
- <target name="layout" depends="init, clean">
- <mkdir dir="${BUILD_DIR}"/>
-
- <copy todir="${BUILD_DIR}">
- <fileset dir="${WSN_CONSUMER_SAMPLE_DIR}">
- <include name="src/**"/>
- <include name="wsdl/**"/>
- <include name="router-entries/**"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <mkdir dir="${OSGI_INF_DIR}"/>
- <copy todir="${OSGI_INF_DIR}">
- <fileset dir="${WSN_CONSUMER_SAMPLE_DIR}/config">
- <include name="muse.xml"/>
- </fileset>
- </copy>
-
- <mkdir dir="${META_INF_DIR}"/>
- <copy todir="${META_INF_DIR}">
- <fileset dir="${basedir}/config">
- <include name="MANIFEST.MF"/>
- </fileset>
- </copy>
- </target>
-
- <target name="java" depends="layout">
- <mkdir dir="${JAVA_DEST_DIR}"/>
- <javac srcdir="${JAVA_SRC_DIR}" destdir="${JAVA_DEST_DIR}" classpathref="muse.class.path"/>
- <jar basedir="${JAVA_DEST_DIR}" destfile="${JAR_FILE}" update="true" duplicate="preserve">
- <fileset dir="${JAVA_DEST_DIR}">
- <include name="**/*.class"/>
- </fileset>
- </jar>
- </target>
-
- <target name="plugins" depends="java">
-
- <mkdir dir="${PLUGIN_DIR}"/>
- <copy todir="${PLUGIN_DIR}">
- <fileset dir="${BUILD_DIR}">
- <include name="OSGI-INF/**"/>
- <include name="META-INF/**"/>
- <include name="wsdl/**"/>
- <include name="router-entries/**"/>
- </fileset>
- </copy>
- <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
- <mkdir dir="${PLUGINS_DIR}"/>
- <copy todir="${PLUGINS_DIR}">
- <fileset dir="${MUSE_TEMPLATE}">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${PLUGINS_DIR}" flatten="true">
- <fileset dir="${MUSE_HOME}/modules/osgi">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${PLUGINS_DIR}/configuration"/>
- <pathconvert property="bundlesProperty" pathsep=", ">
- <chainedmapper>
- <flattenmapper/>
- <regexpmapper from="^(.*)$" to="\1@start"/>
- </chainedmapper>
- <path>
- <dirset dir="plugins" includes="*">
- <exclude name="configuration"/>
- </dirset>
- <fileset dir="plugins">
- <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
- <include name="*.jar"/>
- </fileset>
- </path>
- </pathconvert>
- <copy todir="${PLUGINS_DIR}/configuration">
- <filterchain>
- <replacetokens>
- <token key="XXX" value="${bundlesProperty}"/>
- </replacetokens>
- </filterchain>
- <fileset dir="config">
- <include name="config.ini"/>
- </fileset>
- </copy>
- </target>
-
- <target name="run" >
- <echo message="Launching OSGi framework..."/>
- <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
- <arg value="-console"/>
- <arg value="-clean"/>
- </java>
- <echo message="OSGi framework has exited"/>
- </target>
-
- <target name="run_client" depends="init" >
- <echo message="Running the WSN client..."/>
- <java fork="true" dir="plugins" classname="org.apache.muse.test.wsn.WsnTestClient">
- <classpath>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/core/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/eclipse-osgi/org.apache.xerces_2.8.0.v200606131651">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/common">
- <include name="*.jar"/>
- </fileset>
- <dirset dir="${BUILD_DIR}">
- <include name="**"/>
- </dirset>
-
- </classpath>
- <jvmarg value="-Dproducer_port=80"/>
- </java>
- <echo message="WSN client has exited"/>
- </target>
-
- <target name="clean" depends="init">
- <delete dir="${BUILD_DIR}"/>
- <delete dir="${PLUGINS_DIR}"/>
- </target>
-
-</project>
-
+<?xml version="1.0"?>
+<project name="WSN Consumer OSGi Example" default="java">
+
+ <target name="init">
+ <basename property="NAME" file="${basedir}"/>
+ <property name="MUSE_HOME" value="../../.."/>
+ <property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
+ <property name="AXIS2.1.0_TEMPLATE" value="${MUSE_HOME}/lib/axis2.1.0-osgi"/>
+ <property name="AXIS2.1.1_TEMPLATE" value="${MUSE_HOME}/lib/axis2.1.1-osgi"/>
+ <property name="BUILD_DIR" value="build"/>
+ <property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
+ <property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
+ <property name="OSGI_INF_DIR" value="${BUILD_DIR}/OSGI-INF"/>
+ <property name="META_INF_DIR" value="${BUILD_DIR}/META-INF"/>
+ <property name="PLUGINS_DIR" value="${basedir}/plugins"/>
+ <property name="PLUGIN_DIR" value="${PLUGINS_DIR}/${NAME}"/>
+
+ <property name="WSN_CONSUMER_SAMPLE_DIR" value="../../wsn-consumer"/>
+ <property name="JAR_FILE" value="${BUILD_DIR}/${NAME}.jar"/>
+
+ <path id="muse.class.path">
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/core/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/eclipse-osgi">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/common">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+ <target name="layout" depends="init, clean">
+ <mkdir dir="${BUILD_DIR}"/>
+
+ <copy todir="${BUILD_DIR}">
+ <fileset dir="${WSN_CONSUMER_SAMPLE_DIR}">
+ <include name="src/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${OSGI_INF_DIR}"/>
+ <copy todir="${OSGI_INF_DIR}">
+ <fileset dir="${WSN_CONSUMER_SAMPLE_DIR}/config">
+ <include name="muse.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${META_INF_DIR}"/>
+ <copy todir="${META_INF_DIR}">
+ <fileset dir="${basedir}/config">
+ <include name="MANIFEST.MF"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="java" depends="layout">
+ <mkdir dir="${JAVA_DEST_DIR}"/>
+ <javac srcdir="${JAVA_SRC_DIR}" destdir="${JAVA_DEST_DIR}" classpathref="muse.class.path"/>
+ <jar basedir="${JAVA_DEST_DIR}" destfile="${JAR_FILE}" update="true" duplicate="preserve">
+ <fileset dir="${JAVA_DEST_DIR}">
+ <include name="**/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="axis2.1.1" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${AXIS2.1.1_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="axis2.1.0" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${AXIS2.1.0_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="muse">
+ <mkdir dir="${PLUGIN_DIR}"/>
+ <copy todir="${PLUGIN_DIR}">
+ <fileset dir="${BUILD_DIR}">
+ <include name="OSGI-INF/**"/>
+ <include name="META-INF/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MUSE_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGINS_DIR}" flatten="true">
+ <fileset dir="${MUSE_HOME}/modules/osgi">
+ <include name="**/*.jar"/>
+ <exclude name="complete/*.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${PLUGINS_DIR}/configuration"/>
+ <pathconvert property="bundlesProperty" pathsep=", ">
+ <chainedmapper>
+ <flattenmapper/>
+ <regexpmapper from="^(.*)$" to="\1@start"/>
+ </chainedmapper>
+ <path>
+ <dirset dir="plugins" includes="*">
+ <exclude name="configuration"/>
+ </dirset>
+ <fileset dir="plugins">
+ <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </pathconvert>
+ <copy todir="${PLUGINS_DIR}/configuration">
+ <filterchain>
+ <replacetokens>
+ <token key="XXX" value="${bundlesProperty}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="config">
+ <include name="config.ini"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="muse-complete">
+ <mkdir dir="${PLUGIN_DIR}"/>
+ <copy todir="${PLUGIN_DIR}">
+ <fileset dir="${BUILD_DIR}">
+ <include name="OSGI-INF/**"/>
+ <include name="META-INF/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MUSE_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGINS_DIR}" flatten="true">
+ <fileset dir="${MUSE_HOME}/modules/osgi/complete">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="**/muse-osgi-soa-axis2*.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${PLUGINS_DIR}/configuration"/>
+ <pathconvert property="bundlesProperty" pathsep=", ">
+ <chainedmapper>
+ <flattenmapper/>
+ <regexpmapper from="^(.*)$" to="\1@start"/>
+ </chainedmapper>
+ <path>
+ <dirset dir="plugins" includes="*">
+ <exclude name="configuration"/>
+ </dirset>
+ <fileset dir="plugins">
+ <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </pathconvert>
+ <copy todir="${PLUGINS_DIR}/configuration">
+ <filterchain>
+ <replacetokens>
+ <token key="XXX" value="${bundlesProperty}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="config">
+ <include name="config.ini"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="plugins" depends="axis2.1.1,muse">
+ </target>
+
+
+
+ <target name="complete" depends="axis2.1.1,muse-complete">
+ </target>
+
+ <target name="run" depends="plugins">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-complete" depends="complete">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run_client" depends="init" >
+ <echo message="Running the WSN client..."/>
+ <java fork="true" dir="plugins" classname="org.apache.muse.test.wsn.WsnTestClient">
+ <classpath>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/core/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/eclipse-osgi/org.apache.xerces_2.8.0.v200606131651">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/common">
+ <include name="*.jar"/>
+ </fileset>
+ <dirset dir="${BUILD_DIR}">
+ <include name="**"/>
+ </dirset>
+
+ </classpath>
+ <jvmarg value="-Dproducer_port=80"/>
+ </java>
+ <echo message="WSN client has exited"/>
+ </target>
+
+ <target name="clean" depends="init">
+ <delete dir="${BUILD_DIR}"/>
+ <delete dir="${PLUGINS_DIR}"/>
+ </target>
+
+</project>
+
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/config/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/config/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/config/MANIFEST.MF (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/config/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -5,26 +5,17 @@
Bundle-Version: 1.0.0
Bundle-Activator: org.apache.muse.test.consumer.Activator
Bundle-Localization: plugin
-Import-Package: javax.xml.namespace,
+Import-Package: org.apache.muse.core;version="2.1.0",
+ org.apache.muse.core.platform.osgi.util;version="2.1.0",
+ org.apache.muse.ws.addressing;version="2.1.0",
+ org.apache.muse.ws.addressing.soap;version="2.1.0",
+ org.apache.muse.ws.resource;version="2.1.0",
+ org.apache.muse.ws.resource.impl;version="2.1.0",
+ org.apache.muse.util.xml;version="2.1.0",
+ org.apache.muse.ws.notification;version="2.1.0",
org.osgi.framework;version="1.3.0"
+Require-Bundle: org.eclipse.equinox.common
Export-Package: org.apache.muse.test.consumer
-Require-Bundle: muse.osgi.core,
- muse.osgi.soa.axis2,
- muse.osgi.soa.core,
- muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsrf.api,
- muse.wsrf.impl,
- muse.wsn.api,
- muse.wsn.impl,
- org.eclipse.corona.soa.provider.Axis2,
- org.eclipse.equinox.http,
- org.eclipse.equinox.servlet.api,
- org.eclipse.osgi.services,
- org.eclipse.osgi.util,
- org.eclipse.osgi,
- org.eclipse.equinox.common
MUSE-CONFIG: OSGI-INF/muse.xml
MUSE-CONTEXT: wsn-consumer
Bundle-ClassPath: .,wsn-consumer.jar
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml Sun Dec 10 15:00:15 2006
@@ -1,151 +1,244 @@
-<?xml version="1.0"?>
-<project name="WSN Producer OSGi Example" default="plugins">
-
- <target name="init">
- <basename property="NAME" file="${basedir}"/>
- <property name="MUSE_HOME" value="../../.."/>
- <property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
- <property name="BUILD_DIR" value="build"/>
- <property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
- <property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
- <property name="OSGI_INF_DIR" value="${BUILD_DIR}/OSGI-INF"/>
- <property name="META_INF_DIR" value="${BUILD_DIR}/META-INF"/>
- <property name="PLUGINS_DIR" value="${basedir}/plugins"/>
- <property name="PLUGIN_DIR" value="${PLUGINS_DIR}/${NAME}"/>
-
- <property name="WSN_PRODUCER_SAMPLE_DIR" value="../../wsn-producer"/>
- <property name="WSRF_SAMPLE_DIR" value="../../wsrf"/>
- <property name="JAR_FILE" value="${BUILD_DIR}/${NAME}.jar"/>
-
- <path id="muse.class.path">
- <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/core/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/osgi/core">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/eclipse-osgi">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/common">
- <include name="*.jar"/>
- </fileset>
- </path>
- </target>
-
- <target name="layout" depends="init, clean">
- <mkdir dir="${BUILD_DIR}"/>
-
- <copy todir="${BUILD_DIR}">
- <fileset dir="${WSN_PRODUCER_SAMPLE_DIR}">
- <include name="src/**"/>
- <include name="wsdl/**"/>
- <include name="router-entries/**"/>
- </fileset>
- <fileset dir="${WSRF_SAMPLE_DIR}">
- <include name="src/**/MyCapability*.java"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <mkdir dir="${OSGI_INF_DIR}"/>
- <copy todir="${OSGI_INF_DIR}">
- <fileset dir="${WSN_PRODUCER_SAMPLE_DIR}/config">
- <include name="muse.xml"/>
- </fileset>
- </copy>
-
- <mkdir dir="${META_INF_DIR}"/>
- <copy todir="${META_INF_DIR}">
- <fileset dir="${basedir}/config">
- <include name="MANIFEST.MF"/>
- </fileset>
- </copy>
- </target>
-
- <target name="java" depends="layout">
- <mkdir dir="${JAVA_DEST_DIR}"/>
- <javac srcdir="${JAVA_SRC_DIR}" destdir="${JAVA_DEST_DIR}" classpathref="muse.class.path"/>
- <jar basedir="${JAVA_DEST_DIR}" destfile="${JAR_FILE}" update="true" duplicate="preserve">
- <fileset dir="${JAVA_DEST_DIR}">
- <include name="**/*.class"/>
- </fileset>
- </jar>
- </target>
-
- <target name="plugins" depends="java">
-
- <mkdir dir="${PLUGIN_DIR}"/>
- <copy todir="${PLUGIN_DIR}">
- <fileset dir="${BUILD_DIR}">
- <include name="OSGI-INF/**"/>
- <include name="META-INF/**"/>
- <include name="wsdl/**"/>
- <include name="router-entries/**"/>
- </fileset>
- </copy>
- <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
- <mkdir dir="${PLUGINS_DIR}"/>
- <copy todir="${PLUGINS_DIR}">
- <fileset dir="${MUSE_TEMPLATE}">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${PLUGINS_DIR}" flatten="true">
- <fileset dir="${MUSE_HOME}/modules/osgi">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${PLUGINS_DIR}/configuration"/>
- <pathconvert property="bundlesProperty" pathsep=", ">
- <chainedmapper>
- <flattenmapper/>
- <regexpmapper from="^(.*)$" to="\1@start"/>
- </chainedmapper>
- <path>
- <dirset dir="plugins" includes="*">
- <exclude name="configuration"/>
- </dirset>
- <fileset dir="plugins">
- <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
- <include name="*.jar"/>
- </fileset>
- </path>
- </pathconvert>
- <copy todir="${PLUGINS_DIR}/configuration">
- <filterchain>
- <replacetokens>
- <token key="XXX" value="${bundlesProperty}"/>
- </replacetokens>
- </filterchain>
- <fileset dir="config">
- <include name="config.ini"/>
- </fileset>
- </copy>
- </target>
-
- <target name="run" >
- <echo message="Launching OSGi framework..."/>
- <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
- <arg value="-console"/>
- <arg value="-clean"/>
- </java>
- <echo message="OSGi framework has exited"/>
- </target>
-
- <target name="clean" depends="init">
- <delete dir="${BUILD_DIR}"/>
- <delete dir="${PLUGINS_DIR}"/>
- </target>
-
-</project>
-
+<?xml version="1.0"?>
+<project name="WSN Producer OSGi Example" default="java">
+
+ <target name="init">
+ <basename property="NAME" file="${basedir}"/>
+ <property name="MUSE_HOME" value="../../.."/>
+ <property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
+ <property name="AXIS2.1.0_TEMPLATE" value="${MUSE_HOME}/lib/axis2.1.0-osgi"/>
+ <property name="AXIS2.1.1_TEMPLATE" value="${MUSE_HOME}/lib/axis2.1.1-osgi"/>
+ <property name="BUILD_DIR" value="build"/>
+ <property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
+ <property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
+ <property name="OSGI_INF_DIR" value="${BUILD_DIR}/OSGI-INF"/>
+ <property name="META_INF_DIR" value="${BUILD_DIR}/META-INF"/>
+ <property name="PLUGINS_DIR" value="${basedir}/plugins"/>
+ <property name="PLUGIN_DIR" value="${PLUGINS_DIR}/${NAME}"/>
+
+ <property name="WSN_PRODUCER_SAMPLE_DIR" value="../../wsn-producer"/>
+ <property name="WSRF_SAMPLE_DIR" value="../../wsrf"/>
+ <property name="JAR_FILE" value="${BUILD_DIR}/${NAME}.jar"/>
+
+ <path id="muse.class.path">
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/core/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/eclipse-osgi">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/common">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+ <target name="layout" depends="init, clean">
+ <mkdir dir="${BUILD_DIR}"/>
+
+ <copy todir="${BUILD_DIR}">
+ <fileset dir="${WSN_PRODUCER_SAMPLE_DIR}">
+ <include name="src/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ <fileset dir="${WSRF_SAMPLE_DIR}">
+ <include name="src/**/MyCapability*.java"/>
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${OSGI_INF_DIR}"/>
+ <copy todir="${OSGI_INF_DIR}">
+ <fileset dir="${WSN_PRODUCER_SAMPLE_DIR}/config">
+ <include name="muse.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${META_INF_DIR}"/>
+ <copy todir="${META_INF_DIR}">
+ <fileset dir="${basedir}/config">
+ <include name="MANIFEST.MF"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="java" depends="layout">
+ <mkdir dir="${JAVA_DEST_DIR}"/>
+ <javac srcdir="${JAVA_SRC_DIR}" destdir="${JAVA_DEST_DIR}" classpathref="muse.class.path"/>
+ <jar basedir="${JAVA_DEST_DIR}" destfile="${JAR_FILE}" update="true" duplicate="preserve">
+ <fileset dir="${JAVA_DEST_DIR}">
+ <include name="**/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="axis2.1.1" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${AXIS2.1.1_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="axis2.1.0" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${AXIS2.1.0_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="muse">
+ <mkdir dir="${PLUGIN_DIR}"/>
+ <copy todir="${PLUGIN_DIR}">
+ <fileset dir="${BUILD_DIR}">
+ <include name="OSGI-INF/**"/>
+ <include name="META-INF/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MUSE_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGINS_DIR}" flatten="true">
+ <fileset dir="${MUSE_HOME}/modules/osgi">
+ <include name="**/*.jar"/>
+ <exclude name="complete/*.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${PLUGINS_DIR}/configuration"/>
+ <pathconvert property="bundlesProperty" pathsep=", ">
+ <chainedmapper>
+ <flattenmapper/>
+ <regexpmapper from="^(.*)$" to="\1@start"/>
+ </chainedmapper>
+ <path>
+ <dirset dir="plugins" includes="*">
+ <exclude name="configuration"/>
+ </dirset>
+ <fileset dir="plugins">
+ <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </pathconvert>
+ <copy todir="${PLUGINS_DIR}/configuration">
+ <filterchain>
+ <replacetokens>
+ <token key="XXX" value="${bundlesProperty}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="config">
+ <include name="config.ini"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="muse-complete">
+ <mkdir dir="${PLUGIN_DIR}"/>
+ <copy todir="${PLUGIN_DIR}">
+ <fileset dir="${BUILD_DIR}">
+ <include name="OSGI-INF/**"/>
+ <include name="META-INF/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MUSE_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGINS_DIR}" flatten="true">
+ <fileset dir="${MUSE_HOME}/modules/osgi/complete">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="**/muse-osgi-soa-axis2*.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${PLUGINS_DIR}/configuration"/>
+ <pathconvert property="bundlesProperty" pathsep=", ">
+ <chainedmapper>
+ <flattenmapper/>
+ <regexpmapper from="^(.*)$" to="\1@start"/>
+ </chainedmapper>
+ <path>
+ <dirset dir="plugins" includes="*">
+ <exclude name="configuration"/>
+ </dirset>
+ <fileset dir="plugins">
+ <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </pathconvert>
+ <copy todir="${PLUGINS_DIR}/configuration">
+ <filterchain>
+ <replacetokens>
+ <token key="XXX" value="${bundlesProperty}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="config">
+ <include name="config.ini"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="plugins" depends="axis2.1.1,muse">
+ </target>
+
+
+
+ <target name="complete" depends="axis2.1.1,muse-complete">
+ </target>
+
+ <target name="run" depends="plugins">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-complete" depends="complete">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+
+ <target name="clean" depends="init">
+ <delete dir="${BUILD_DIR}"/>
+ <delete dir="${PLUGINS_DIR}"/>
+ </target>
+
+</project>
+
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/config/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/config/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/config/MANIFEST.MF (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/config/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -5,26 +5,17 @@
Bundle-Version: 1.0.0
Bundle-Activator: org.apache.muse.test.producer.Activator
Bundle-Localization: plugin
-Import-Package: javax.xml.namespace,
+Import-Package: org.apache.muse.core;version="2.1.0",
+ org.apache.muse.core.platform.osgi.util;version="2.1.0",
+ org.apache.muse.ws.addressing;version="2.1.0",
+ org.apache.muse.ws.addressing.soap;version="2.1.0",
+ org.apache.muse.ws.resource;version="2.1.0",
+ org.apache.muse.ws.resource.impl;version="2.1.0",
+ org.apache.muse.util.xml;version="2.1.0",
+ org.apache.muse.ws.notification;version="2.1.0",
org.osgi.framework;version="1.3.0"
+Require-Bundle: org.eclipse.equinox.common
Export-Package: org.apache.muse.test.producer
-Require-Bundle: muse.osgi.core,
- muse.osgi.soa.axis2,
- muse.osgi.soa.core,
- muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsrf.api,
- muse.wsrf.impl,
- muse.wsn.api,
- muse.wsn.impl,
- org.eclipse.corona.soa.provider.Axis2,
- org.eclipse.equinox.http,
- org.eclipse.equinox.servlet.api,
- org.eclipse.osgi.services,
- org.eclipse.osgi.util,
- org.eclipse.osgi,
- org.eclipse.equinox.common
MUSE-CONFIG: OSGI-INF/muse.xml
MUSE-CONTEXT: wsn-producer
Bundle-ClassPath: .,wsn-producer.jar
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml Sun Dec 10 15:00:15 2006
@@ -1,175 +1,268 @@
-<?xml version="1.0"?>
-<project name="WSRF OSGi Example" default="plugins">
-
- <target name="init">
- <basename property="NAME" file="${basedir}"/>
- <property name="MUSE_HOME" value="../../.."/>
- <property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
- <property name="BUILD_DIR" value="build"/>
- <property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
- <property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
- <property name="OSGI_INF_DIR" value="${BUILD_DIR}/OSGI-INF"/>
- <property name="META_INF_DIR" value="${BUILD_DIR}/META-INF"/>
- <property name="PLUGINS_DIR" value="${basedir}/plugins"/>
- <property name="PLUGIN_DIR" value="${PLUGINS_DIR}/${NAME}"/>
-
- <property name="WSRF_SAMPLE_DIR" value="../../wsrf"/>
- <property name="JAR_FILE" value="${BUILD_DIR}/${NAME}.jar"/>
-
- <path id="muse.class.path">
- <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/core/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/osgi/core">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/eclipse-osgi">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/common">
- <include name="*.jar"/>
- </fileset>
- </path>
- </target>
-
- <target name="layout" depends="init, clean">
- <mkdir dir="${BUILD_DIR}"/>
-
- <copy todir="${BUILD_DIR}">
- <fileset dir="${WSRF_SAMPLE_DIR}">
- <include name="src/**"/>
- <include name="wsdl/**"/>
- <include name="router-entries/**"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <mkdir dir="${OSGI_INF_DIR}"/>
- <copy todir="${OSGI_INF_DIR}">
- <fileset dir="${WSRF_SAMPLE_DIR}/config">
- <include name="muse.xml"/>
- </fileset>
- </copy>
-
- <mkdir dir="${META_INF_DIR}"/>
- <copy todir="${META_INF_DIR}">
- <fileset dir="${basedir}/config">
- <include name="MANIFEST.MF"/>
- </fileset>
- </copy>
- </target>
-
- <target name="java" depends="layout">
- <mkdir dir="${JAVA_DEST_DIR}"/>
- <javac srcdir="${JAVA_SRC_DIR}" destdir="${JAVA_DEST_DIR}" classpathref="muse.class.path"/>
- <jar basedir="${JAVA_DEST_DIR}" destfile="${JAR_FILE}">
- <fileset dir="${JAVA_DEST_DIR}">
- <include name="**/*.class"/>
- </fileset>
- </jar>
- </target>
-
- <target name="plugins" depends="java">
-
- <mkdir dir="${PLUGIN_DIR}"/>
- <copy todir="${PLUGIN_DIR}">
- <fileset dir="${BUILD_DIR}">
- <include name="OSGI-INF/**"/>
- <include name="META-INF/**"/>
- <include name="wsdl/**"/>
- <include name="router-entries/**"/>
- </fileset>
- </copy>
- <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
- <mkdir dir="${PLUGINS_DIR}"/>
- <copy todir="${PLUGINS_DIR}">
- <fileset dir="${MUSE_TEMPLATE}">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${PLUGINS_DIR}" flatten="true">
- <fileset dir="${MUSE_HOME}/modules/osgi">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${PLUGINS_DIR}/configuration"/>
- <pathconvert property="bundlesProperty" pathsep=", ">
- <chainedmapper>
- <flattenmapper/>
- <regexpmapper from="^(.*)$" to="\1@start"/>
- </chainedmapper>
- <path>
- <dirset dir="plugins" includes="*">
- <exclude name="configuration"/>
- </dirset>
- <fileset dir="plugins">
- <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
- <include name="*.jar"/>
- </fileset>
- </path>
- </pathconvert>
- <copy todir="${PLUGINS_DIR}/configuration">
- <filterchain>
- <replacetokens>
- <token key="XXX" value="${bundlesProperty}"/>
- </replacetokens>
- </filterchain>
- <fileset dir="config">
- <include name="config.ini"/>
- </fileset>
- </copy>
- </target>
-
- <target name="run" >
- <echo message="Launching OSGi framework..."/>
- <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
- <arg value="-console"/>
- <arg value="-clean"/>
- </java>
- <echo message="OSGi framework has exited"/>
- </target>
-
- <target name="run_client" depends="init" >
- <echo message="Running the WSRF client..."/>
- <java fork="true" dir="plugins" classname="org.apache.muse.test.wsrf.WsrfTestClient">
- <classpath>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/modules/core/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/eclipse-osgi/org.apache.xerces_2.8.0.v200606131651">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${MUSE_HOME}/lib/common">
- <include name="*.jar"/>
- </fileset>
- <dirset dir="${BUILD_DIR}">
- <include name="**"/>
- </dirset>
-
- </classpath>
- </java>
- <echo message="WSRF client has exited"/>
- </target>
-
- <target name="clean" depends="init">
- <delete dir="${BUILD_DIR}"/>
- <delete dir="${PLUGINS_DIR}"/>
- </target>
-
-</project>
-
+<?xml version="1.0"?>
+<project name="WSRF OSGi Example" default="java">
+
+ <target name="init">
+ <basename property="NAME" file="${basedir}"/>
+ <property name="MUSE_HOME" value="../../.."/>
+ <property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
+ <property name="AXIS2.1.0_TEMPLATE" value="${MUSE_HOME}/lib/axis2.1.0-osgi"/>
+ <property name="AXIS2.1.1_TEMPLATE" value="${MUSE_HOME}/lib/axis2.1.1-osgi"/>
+ <property name="BUILD_DIR" value="build"/>
+ <property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
+ <property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
+ <property name="OSGI_INF_DIR" value="${BUILD_DIR}/OSGI-INF"/>
+ <property name="META_INF_DIR" value="${BUILD_DIR}/META-INF"/>
+ <property name="PLUGINS_DIR" value="${basedir}/plugins"/>
+ <property name="PLUGIN_DIR" value="${PLUGINS_DIR}/${NAME}"/>
+
+ <property name="WSRF_SAMPLE_DIR" value="../../wsrf"/>
+ <property name="JAR_FILE" value="${BUILD_DIR}/${NAME}.jar"/>
+
+ <path id="muse.class.path">
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/core/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/eclipse-osgi">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/common">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+
+ <target name="layout" depends="init, clean">
+ <mkdir dir="${BUILD_DIR}"/>
+
+ <copy todir="${BUILD_DIR}">
+ <fileset dir="${WSRF_SAMPLE_DIR}">
+ <include name="src/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${OSGI_INF_DIR}"/>
+ <copy todir="${OSGI_INF_DIR}">
+ <fileset dir="${WSRF_SAMPLE_DIR}/config">
+ <include name="muse.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${META_INF_DIR}"/>
+ <copy todir="${META_INF_DIR}">
+ <fileset dir="${basedir}/config">
+ <include name="MANIFEST.MF"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="java" depends="layout">
+ <mkdir dir="${JAVA_DEST_DIR}"/>
+ <javac srcdir="${JAVA_SRC_DIR}" destdir="${JAVA_DEST_DIR}" classpathref="muse.class.path"/>
+ <jar basedir="${JAVA_DEST_DIR}" destfile="${JAR_FILE}">
+ <fileset dir="${JAVA_DEST_DIR}">
+ <include name="**/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="axis2.1.1" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${AXIS2.1.1_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="axis2.1.0" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${AXIS2.1.0_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="muse">
+ <mkdir dir="${PLUGIN_DIR}"/>
+ <copy todir="${PLUGIN_DIR}">
+ <fileset dir="${BUILD_DIR}">
+ <include name="OSGI-INF/**"/>
+ <include name="META-INF/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MUSE_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGINS_DIR}" flatten="true">
+ <fileset dir="${MUSE_HOME}/modules/osgi">
+ <include name="**/*.jar"/>
+ <exclude name="complete/*.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${PLUGINS_DIR}/configuration"/>
+ <pathconvert property="bundlesProperty" pathsep=", ">
+ <chainedmapper>
+ <flattenmapper/>
+ <regexpmapper from="^(.*)$" to="\1@start"/>
+ </chainedmapper>
+ <path>
+ <dirset dir="plugins" includes="*">
+ <exclude name="configuration"/>
+ </dirset>
+ <fileset dir="plugins">
+ <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </pathconvert>
+ <copy todir="${PLUGINS_DIR}/configuration">
+ <filterchain>
+ <replacetokens>
+ <token key="XXX" value="${bundlesProperty}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="config">
+ <include name="config.ini"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="muse-complete">
+ <mkdir dir="${PLUGIN_DIR}"/>
+ <copy todir="${PLUGIN_DIR}">
+ <fileset dir="${BUILD_DIR}">
+ <include name="OSGI-INF/**"/>
+ <include name="META-INF/**"/>
+ <include name="wsdl/**"/>
+ <include name="router-entries/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGIN_DIR}" file="${JAR_FILE}"/>
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MUSE_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${PLUGINS_DIR}" flatten="true">
+ <fileset dir="${MUSE_HOME}/modules/osgi/complete">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="**/muse-osgi-soa-axis2*.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${PLUGINS_DIR}/configuration"/>
+ <pathconvert property="bundlesProperty" pathsep=", ">
+ <chainedmapper>
+ <flattenmapper/>
+ <regexpmapper from="^(.*)$" to="\1@start"/>
+ </chainedmapper>
+ <path>
+ <dirset dir="plugins" includes="*">
+ <exclude name="configuration"/>
+ </dirset>
+ <fileset dir="plugins">
+ <exclude name="org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </pathconvert>
+ <copy todir="${PLUGINS_DIR}/configuration">
+ <filterchain>
+ <replacetokens>
+ <token key="XXX" value="${bundlesProperty}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="config">
+ <include name="config.ini"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="plugins" depends="axis2.1.1,muse">
+ </target>
+
+
+
+ <target name="complete" depends="axis2.1.1,muse-complete">
+ </target>
+
+
+ <target name="run" depends="plugins">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-complete" depends="complete">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run_client" depends="init" >
+ <echo message="Running the WSRF client..."/>
+ <java fork="true" dir="plugins" classname="org.apache.muse.test.wsrf.WsrfTestClient">
+ <classpath>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-api/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/ws-fx-impl/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/modules/core/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/eclipse-osgi/org.apache.xerces_2.8.0.v200606131651">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${MUSE_HOME}/lib/common">
+ <include name="*.jar"/>
+ </fileset>
+ <dirset dir="${BUILD_DIR}">
+ <include name="**"/>
+ </dirset>
+
+ </classpath>
+ </java>
+ <echo message="WSRF client has exited"/>
+ </target>
+
+ <target name="clean" depends="init">
+ <delete dir="${BUILD_DIR}"/>
+ <delete dir="${PLUGINS_DIR}"/>
+ </target>
+
+</project>
+
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsrf/config/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsrf/config/MANIFEST.MF?view=diff&rev=485298&r1=485297&r2=485298
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsrf/config/MANIFEST.MF (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsrf/config/MANIFEST.MF Sun Dec 10 15:00:15 2006
@@ -1,29 +1,14 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WSRF OSGi Capability
-Bundle-SymbolicName: wsrf
Bundle-Version: 1.0.0
Bundle-Activator: org.apache.muse.test.wsrf.Activator
Bundle-Localization: plugin
-Import-Package: javax.xml.namespace,
+Import-Package: org.apache.muse.core;version="2.1.0",
+ org.apache.muse.core.platform.osgi.util;version="2.1.0",
+ org.apache.muse.ws.addressing;version="2.1.0",
+ org.apache.muse.ws.addressing.soap;version="2.1.0",
+ org.apache.muse.ws.resource;version="2.1.0",
+ org.apache.muse.ws.resource.impl;version="2.1.0",
org.osgi.framework;version="1.3.0"
-Require-Bundle: muse.osgi.core,
- muse.osgi.soa.axis2,
- muse.osgi.soa.core,
- muse.core,
- muse.util.all,
- muse.wsa.soap,
- muse.wsrf.api,
- muse.wsrf.impl,
- org.eclipse.corona.soa.provider.Axis2,
- org.eclipse.equinox.http,
- org.eclipse.equinox.servlet.api,
- org.eclipse.osgi.services,
- org.eclipse.osgi.util,
- org.eclipse.osgi,
- org.eclipse.equinox.common
+Require-Bundle: org.eclipse.equinox.common
MUSE-CONFIG: OSGI-INF/muse.xml
MUSE-CONTEXT: test-wsrf
Bundle-ClassPath: .,wsrf.jar
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org