Author: mes
Date: 2011-09-15 15:46:45 -0700 (Thu, 15 Sep 2011)
New Revision: 26831
Added:
core3/impl/branches/no-spring/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/webservice-impl/osgi.bnd
core3/impl/branches/no-spring/webservice-impl/pom.xml
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/webservice-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/webservice-impl/osgi.bnd 2011-09-15
22:38:36 UTC (rev 26830)
+++ core3/impl/branches/no-spring/webservice-impl/osgi.bnd 2011-09-15
22:46:45 UTC (rev 26831)
@@ -2,4 +2,6 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Import-Package: *
\ No newline at end of file
+Import-Package: *
+Private-Package: ${bundle.namespace}, ${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Modified: core3/impl/branches/no-spring/webservice-impl/pom.xml
===================================================================
--- core3/impl/branches/no-spring/webservice-impl/pom.xml 2011-09-15
22:38:36 UTC (rev 26830)
+++ core3/impl/branches/no-spring/webservice-impl/pom.xml 2011-09-15
22:46:45 UTC (rev 26831)
@@ -86,24 +86,22 @@
</repository>
</repositories>
<dependencies>
-
- <!-- Cytoscape modules -->
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>webservice-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
</dependency>
-
-
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>work-swing-api</artifactId>
+ </dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
Added:
core3/impl/branches/no-spring/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
2011-09-15 22:46:45 UTC (rev 26831)
@@ -0,0 +1,41 @@
+
+
+
+
+package org.cytoscape.webservice.internal;
+
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.work.swing.GUITaskManager;
+
+import org.cytoscape.webservice.internal.ui.UnifiedNetworkImportDialog;
+import org.cytoscape.webservice.internal.task.ShowNetworkImportDialogAction;
+
+import org.cytoscape.application.swing.CyAction;
+
+
+import org.osgi.framework.BundleContext;
+
+import org.cytoscape.service.util.AbstractCyActivator;
+
+import java.util.Properties;
+
+
+
+public class CyActivator extends AbstractCyActivator {
+ public CyActivator() {
+ super();
+ }
+
+ public void start(BundleContext bc) {
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+ CySwingApplication cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
+ GUITaskManager taskManagerServiceRef =
getService(bc,GUITaskManager.class);
+
+ UnifiedNetworkImportDialog unifiedNetworkImportDialog = new
UnifiedNetworkImportDialog(taskManagerServiceRef);
+ ShowNetworkImportDialogAction showNetworkImportDialogAction =
new
ShowNetworkImportDialogAction(cyApplicationManagerServiceRef,cySwingApplicationServiceRef,unifiedNetworkImportDialog);
+
+
registerService(bc,showNetworkImportDialogAction,CyAction.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 22:38:36 UTC (rev 26830)
+++
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 22:46:45 UTC (rev 26831)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
-
-
- <!-- Import Application Manager -->
- <osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <!-- Import ref to desktop application -->
- <osgi:reference id="cySwingApplicationServiceRef"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="taskManagerServiceRef"
- interface="org.cytoscape.work.swing.GUITaskManager" />
-
-
- <!-- Export actions -->
- <osgi:service id="showNetworkImportDialogActionService"
- ref="showNetworkImportDialogAction"
interface="org.cytoscape.application.swing.CyAction" />
-
-
- <!-- Import client list -->
- <osgi:set id="networkImportClientSet"
- cardinality="0..N">
- <osgi:interfaces>
-
<value>org.cytoscape.io.webservice.NetworkImportWebServiceClient</value>
-
<value>org.cytoscape.io.webservice.WebServiceClient</value>
-
<value>org.cytoscape.io.webservice.SearchWebServiceClient</value>
- </osgi:interfaces>
- <osgi:listener bind-method="addNetworkImportClient"
- unbind-method="removeNetworkImportClient"
ref="unifiedNetworkImportDialog" />
- </osgi:set>
-
-</beans>
Copied:
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 22:46:45 UTC (rev 26831)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
+ default-lazy-init="false">
+
+
+ <!-- Import Application Manager -->
+ <osgi:reference id="cyApplicationManagerServiceRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <!-- Import ref to desktop application -->
+ <osgi:reference id="cySwingApplicationServiceRef"
+ interface="org.cytoscape.application.swing.CySwingApplication"
/>
+
+ <osgi:reference id="taskManagerServiceRef"
+ interface="org.cytoscape.work.swing.GUITaskManager" />
+
+
+ <!-- Export actions -->
+ <osgi:service id="showNetworkImportDialogActionService"
+ ref="showNetworkImportDialogAction"
interface="org.cytoscape.application.swing.CyAction" />
+
+
+ <!-- Import client list -->
+ <osgi:set id="networkImportClientSet"
+ cardinality="0..N">
+ <osgi:interfaces>
+
<value>org.cytoscape.io.webservice.NetworkImportWebServiceClient</value>
+
<value>org.cytoscape.io.webservice.WebServiceClient</value>
+
<value>org.cytoscape.io.webservice.SearchWebServiceClient</value>
+ </osgi:interfaces>
+ <osgi:listener bind-method="addNetworkImportClient"
+ unbind-method="removeNetworkImportClient"
ref="unifiedNetworkImportDialog" />
+ </osgi:set>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 22:38:36 UTC (rev 26830)
+++
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 22:46:45 UTC (rev 26831)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
- xmlns:util="http://www.springframework.org/schema/util";
xmlns:context="http://www.springframework.org/schema/context";
- xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
-
-
- <context:annotation-config />
-
- <bean id="unifiedNetworkImportDialog"
class="org.cytoscape.webservice.internal.ui.UnifiedNetworkImportDialog" >
- <constructor-arg ref="taskManagerServiceRef" />
- </bean>
-
- <bean id="showNetworkImportDialogAction"
-
class="org.cytoscape.webservice.internal.task.ShowNetworkImportDialogAction">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="unifiedNetworkImportDialog" />
- </bean>
-
-</beans>
Copied:
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/webservice-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 22:46:45 UTC (rev 26831)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
+ xmlns:util="http://www.springframework.org/schema/util";
xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
+ default-lazy-init="false">
+
+
+ <context:annotation-config />
+
+ <bean id="unifiedNetworkImportDialog"
class="org.cytoscape.webservice.internal.ui.UnifiedNetworkImportDialog" >
+ <constructor-arg ref="taskManagerServiceRef" />
+ </bean>
+
+ <bean id="showNetworkImportDialogAction"
+
class="org.cytoscape.webservice.internal.task.ShowNetworkImportDialogAction">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="unifiedNetworkImportDialog" />
+ </bean>
+
+</beans>
--
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.
