You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by do...@apache.org on 2008/01/15 18:25:48 UTC
svn commit: r612163 - in /felix/sandbox/donsez/eventadmin.cmd: ./ doc/ site/
src/main/java/org/apache/felix/eventadmin/
src/main/java/org/apache/felix/sandbox/
src/main/java/org/apache/felix/sandbox/eventadmin/
src/main/java/org/apache/felix/sandbox/ev...
Author: donsez
Date: Tue Jan 15 09:25:41 2008
New Revision: 612163
URL: http://svn.apache.org/viewvc?rev=612163&view=rev
Log:
complete the documentation and the command script eventadmin.txt. refactor the sources to add sandbox to the package names.
Added:
felix/sandbox/donsez/eventadmin.cmd/site/
- copied from r567866, felix/sandbox/donsez/eventadmin.cmd/doc/
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/
- copied from r567866, felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/eventadmin/cmd/
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/
- copied from r567866, felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/eventadmin/util/
Removed:
felix/sandbox/donsez/eventadmin.cmd/doc/
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/eventadmin/
Modified:
felix/sandbox/donsez/eventadmin.cmd/pom.xml
felix/sandbox/donsez/eventadmin.cmd/site/eventadmin.txt
felix/sandbox/donsez/eventadmin.cmd/site/readme.html
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventAdminCommand.java
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSink.java
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSinkWithDelay.java
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventPropertiesWrapper.java
felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventUtil.java
Modified: felix/sandbox/donsez/eventadmin.cmd/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/pom.xml?rev=612163&r1=612162&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/pom.xml (original)
+++ felix/sandbox/donsez/eventadmin.cmd/pom.xml Tue Jan 15 09:25:41 2008
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix EventAdmin Command</name>
- <artifactId>org.apache.felix.eventadmin.cmd</artifactId>
+ <artifactId>org.apache.felix.sandbox.eventadmin.cmd</artifactId>
<description>provides a command to use and test the Event Admin service.</description>
<dependencies>
@@ -45,7 +45,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
+ <version>0.9.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -69,14 +69,9 @@
<instructions>
<Export-Service>org.apache.felix.shell.Command,org.osgi.service.eventadmin.EventHandler</Export-Service>
<Import-Service>org.osgi.service.eventadmin.EventAdmin</Import-Service>
- <Private-Package>org.apache.felix.eventadmin.cmd.*,org.apache.felix.eventadmin.util.*</Private-Package>
+ <Private-Package>org.apache.felix.sandbox.eventadmin.cmd.*,org.apache.felix.sandbox.eventadmin.util.*</Private-Package>
<Import-Package>*</Import-Package>
- <Bundle-Activator>${pom.artifactId}.EventAdminCommand</Bundle-Activator>
- <Bundle-DocUrl>${repositoryLocation}${pom.artifactId}/readme.html</Bundle-DocUrl>
- <Bundle-Url>${repositoryLocation}${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</Bundle-Url>
- <Bundle-Source>${repositoryLocation}${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</Bundle-Source>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Description>provides a command to use and test the Event Admin service.</Bundle-Description>
+ <Bundle-Activator>${pom.artifactId}.EventAdminCommand</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Modified: felix/sandbox/donsez/eventadmin.cmd/site/eventadmin.txt
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/site/eventadmin.txt?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/site/eventadmin.txt (original)
+++ felix/sandbox/donsez/eventadmin.cmd/site/eventadmin.txt Tue Jan 15 09:25:41 2008
@@ -1,16 +1,13 @@
rem This script illustrates the Event Admin service v1.0 (R4 chapter 113)
-rem (c) Didier Donsez, 2005
-rem start the "run" command http://www-adele.imag.fr/users/Didier.Donsez/dev/osgi/scriptcmd/scriptcmd.jar to run this script
-rem failifnot filter (org.osgi.framework.version>=4.0)
+obr start "Apache Felix EventAdmin"
+obr start "Apache Felix EventAdmin Bridge Configuration"
+obr start "Apache Felix EventAdmin Bridge UPnP"
+obr start "Apache Felix EventAdmin Bridge UserAdmin"
+obr start "Apache Felix EventAdmin Bridge WireAdmin"
-cd http://www-adele.imag.fr/users/Didier.Donsez/dev/osgi/
-
-obr install "OSGi Util"
-obr install "OSGi Service"
-obr install "Event Admin"
-
-start eventadmincmd/eventadmincmd.jar
+obr start "Apache Felix Declarative Services"
+obr start "Apache Felix EventAdmin Command"
rem handlers for standard events
eventadmin subscribe org/osgi/framework/*
@@ -20,26 +17,25 @@
start eventadmindemo/eventadmindemo.jar
-eventadmin subscribe fr/imag/*
-eventadmin subscribe fr/imag/adele/*
-eventadmin subscribe fr/imag/adele/TimerEvent
+eventadmin subscribe org/apache/felix/*
+eventadmin subscribe org/apache/felix/sandbox/*
+eventadmin subscribe org/apache/felix/sandbox/TimerEvent
eventadmin subscribe org/foo/*
-eventadmin send fr/imag/adele/DummyEvent foo=bar&tic=tac%20toe
-eventadmin post fr/imag/adele/DummyEvent bar=foo&tic=tac%20toe+tic
+eventadmin send org/apache/felix/sandbox/DummyEvent foo=bar&tic=tac%20toe
+eventadmin post org/apache/felix/sandbox/DummyEvent bar=foo&tic=tac%20toe+tic
eventadmin list
-eventadmin remove fr/imag/*
-eventadmin remove fr/imag/adele/*
+eventadmin remove org/apache/*
+eventadmin remove org/apache/felix/sandbox/*
rem Test the UPnP EA events
eventadmin subscribe org/osgi/service/upnp/UPnPEvent/*
-obr start "UPnP Base Driver"
-start upnpeventpublisher/upnpeventpublisher.jar
+obr start "Apache Felix UPnP Base Driver"
rem Test the heart beat events
start heartbeateventpublisher/heartbeateventpublisher.jar
-eventadmin subscribe fr/imag/adele/management/HeartBeatEvent/*
-rem in another profile, start http://www-adele.imag.fr/users/Didier.Donsez/dev/osgi/heartbeat/heartbeat.jar
\ No newline at end of file
+eventadmin subscribe org/apache/felix/sandbox/management/HeartBeatEvent/*
+rem in another profile, start http://people.apache.org/~donsez/dev/osgi/heartbeat/heartbeat.jar
\ No newline at end of file
Modified: felix/sandbox/donsez/eventadmin.cmd/site/readme.html
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/site/readme.html?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/site/readme.html (original)
+++ felix/sandbox/donsez/eventadmin.cmd/site/readme.html Tue Jan 15 09:25:41 2008
@@ -18,13 +18,6 @@
Apache Felix team
</p>
-<p><b>Distribution</b><br>
-<ul>
-<li><a href="eventadmin.cmd.jar">the bundle jar</a></li>
-<li><a href="eventadmin.cmd-src.jar">the source jar</a></li>
-</ul>
-</p>
-
<p><b>License</b><br>
ASL2
@@ -34,14 +27,7 @@
<p><b>Services</b><br>
<ul>
<li>org.osgi.service.event.EventHandler</li>
-<li>org.ungoverned.osgi.service.shell.Command</li>
-</ul>
-</p>
-
-<p id="doc"><b>Documentation</b><br>
-<ul>
-<li><a href=".">general</a></li>
-<li><a href="api">JavaDoc</a></li>
+<li>org.apache.felix.shell.Command</li>
</ul>
</p>
@@ -55,7 +41,7 @@
<p id="todolist"><b>TODOLIST</b><br>
<ul>
-<li>tracer persistence option -p (save the topicPattern)</li>
+<li>tracer persistence (option -p) (save the topicPattern between start/stop/shudown)</li>
</ul>
</p>
Modified: felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventAdminCommand.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventAdminCommand.java?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventAdminCommand.java (original)
+++ felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventAdminCommand.java Tue Jan 15 09:25:41 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.eventadmin.cmd;
+package org.apache.felix.sandbox.eventadmin.cmd;
import java.io.PrintStream;
import java.net.URLDecoder;
Modified: felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSink.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSink.java?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSink.java (original)
+++ felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSink.java Tue Jan 15 09:25:41 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.eventadmin.cmd;
+package org.apache.felix.sandbox.eventadmin.cmd;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -26,7 +26,7 @@
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
-import org.apache.felix.eventadmin.util.EventUtil;
+import org.apache.felix.sandbox.eventadmin.util.EventUtil;
/**
* This class provides a sample of a subscriber (ie Event Handler)
Modified: felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSinkWithDelay.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSinkWithDelay.java?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSinkWithDelay.java (original)
+++ felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/cmd/EventSinkWithDelay.java Tue Jan 15 09:25:41 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.eventadmin.cmd;
+package org.apache.felix.sandbox.eventadmin.cmd;
import org.osgi.framework.BundleActivator;
import org.osgi.service.event.Event;
Modified: felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventPropertiesWrapper.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventPropertiesWrapper.java?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventPropertiesWrapper.java (original)
+++ felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventPropertiesWrapper.java Tue Jan 15 09:25:41 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.eventadmin.util;
+package org.apache.felix.sandbox.eventadmin.util;
import java.util.Dictionary;
import java.util.Enumeration;
Modified: felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventUtil.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventUtil.java?rev=612163&r1=567866&r2=612163&view=diff
==============================================================================
--- felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventUtil.java (original)
+++ felix/sandbox/donsez/eventadmin.cmd/src/main/java/org/apache/felix/sandbox/eventadmin/util/EventUtil.java Tue Jan 15 09:25:41 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.eventadmin.util;
+package org.apache.felix.sandbox.eventadmin.util;
/**
* This utilities class provides methods to compare topics and topic patterns