Author: mes
Date: 2011-09-16 16:22:41 -0700 (Fri, 16 Sep 2011)
New Revision: 26851
Modified:
core3/support/branches/no-spring/launch-framework/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
core3/support/branches/no-spring/splash-updater-impl/pom.xml
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashActivator.java
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashManipulator.java
Log:
updated launcher and splash updater for no spring
Modified:
core3/support/branches/no-spring/launch-framework/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
===================================================================
---
core3/support/branches/no-spring/launch-framework/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
2011-09-16 23:21:50 UTC (rev 26850)
+++
core3/support/branches/no-spring/launch-framework/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
2011-09-16 23:22:41 UTC (rev 26851)
@@ -46,7 +46,7 @@
try {
Map config = new HashMap();
config.putAll(System.getProperties());
- config.put("org.osgi.framework.startlevel.beginning",
"6");
+ config.put("org.osgi.framework.startlevel.beginning",
"100");
config.put("org.osgi.framework.storage",
"bundles/cache");
config.put("org.osgi.framework.storage.clean",
"onFirstInit");
Modified: core3/support/branches/no-spring/splash-updater-impl/pom.xml
===================================================================
--- core3/support/branches/no-spring/splash-updater-impl/pom.xml
2011-09-16 23:21:50 UTC (rev 26850)
+++ core3/support/branches/no-spring/splash-updater-impl/pom.xml
2011-09-16 23:22:41 UTC (rev 26851)
@@ -77,11 +77,13 @@
<version>${osgi.api.version}</version>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-extender</artifactId>
<version>${spring.osgi.version}</version>
</dependency>
+ -->
</dependencies>
</project>
Modified:
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashActivator.java
===================================================================
---
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashActivator.java
2011-09-16 23:21:50 UTC (rev 26850)
+++
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashActivator.java
2011-09-16 23:22:41 UTC (rev 26851)
@@ -4,7 +4,7 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.BundleListener;
-import
org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
+//import
org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
import java.util.Properties;
/**
@@ -20,7 +20,7 @@
SplashManipulator splash = new SplashManipulator();
bc.addFrameworkListener(splash);
bc.addBundleListener(splash);
-
bc.registerService(OsgiBundleApplicationContextListener.class.getName(),splash,new
Properties());
+//
bc.registerService(OsgiBundleApplicationContextListener.class.getName(),splash,new
Properties());
}
/**
Modified:
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashManipulator.java
===================================================================
---
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashManipulator.java
2011-09-16 23:21:50 UTC (rev 26850)
+++
core3/support/branches/no-spring/splash-updater-impl/src/main/java/org/cytoscape/splash/internal/SplashManipulator.java
2011-09-16 23:22:41 UTC (rev 26851)
@@ -8,13 +8,13 @@
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.BundleListener;
import org.osgi.framework.FrameworkListener;
-import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
-import
org.springframework.osgi.context.event.OsgiBundleApplicationContextEvent;
-import
org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
+//import
org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
+//import
org.springframework.osgi.context.event.OsgiBundleApplicationContextEvent;
+//import
org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
import java.awt.Font;
public class SplashManipulator implements
- OsgiBundleApplicationContextListener,
+ //OsgiBundleApplicationContextListener,
BundleListener,
FrameworkListener {
@@ -42,10 +42,10 @@
renderSplashFrame("OSGi finished!");
}
- public void onOsgiApplicationEvent(OsgiBundleApplicationContextEvent
event) {
- if ( event instanceof OsgiBundleContextRefreshedEvent )
- renderSplashFrame( event.getBundle().getSymbolicName()
+ " refreshed");
- }
+// public void onOsgiApplicationEvent(OsgiBundleApplicationContextEvent
event) {
+// if ( event instanceof OsgiBundleContextRefreshedEvent )
+// renderSplashFrame( event.getBundle().getSymbolicName()
+ " refreshed");
+// }
private synchronized void renderSplashFrame(String message) {
if ( g == null || splash == null || !splash.isVisible() )
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
