Author: mes
Date: 2011-09-15 15:49:56 -0700 (Thu, 15 Sep 2011)
New Revision: 26832
Added:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/osgi.bnd
core3/impl/branches/no-spring/webservice-ncbi-client-impl/pom.xml
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/webservice-ncbi-client-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/webservice-ncbi-client-impl/osgi.bnd
2011-09-15 22:46:45 UTC (rev 26831)
+++ core3/impl/branches/no-spring/webservice-ncbi-client-impl/osgi.bnd
2011-09-15 22:49:56 UTC (rev 26832)
@@ -3,3 +3,5 @@
#-----------------------------------------------------------------
Import-Package: *
+Private-Package: ${bundle.namespace},${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Modified: core3/impl/branches/no-spring/webservice-ncbi-client-impl/pom.xml
===================================================================
--- core3/impl/branches/no-spring/webservice-ncbi-client-impl/pom.xml
2011-09-15 22:46:45 UTC (rev 26831)
+++ core3/impl/branches/no-spring/webservice-ncbi-client-impl/pom.xml
2011-09-15 22:49:56 UTC (rev 26832)
@@ -92,19 +92,16 @@
<!-- Cytoscape modules -->
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>service-api</artifactId>
- <scope>test</scope>
+ <artifactId>work-swing-api</artifactId>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>webservice-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
Added:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/CyActivator.java
2011-09-15 22:49:56 UTC (rev 26832)
@@ -0,0 +1,53 @@
+
+
+
+
+package org.cytoscape.webservice.ncbi;
+
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.work.swing.GUITaskManager;
+
+import org.cytoscape.webservice.ncbi.NCBIWebServiceClient;
+import org.cytoscape.webservice.ncbi.NCBITableImportAction;
+import org.cytoscape.webservice.ncbi.NCBITableImportClient;
+
+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 cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
+ CyNetworkFactory cyNetworkFactoryServiceRef =
getService(bc,CyNetworkFactory.class);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+ GUITaskManager taskManagerServiceRef =
getService(bc,GUITaskManager.class);
+ CyTableManager cyTableManagerServiceRef =
getService(bc,CyTableManager.class);
+ CyTableFactory cyDataTableFactoryServiceRef =
getService(bc,CyTableFactory.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+
+ NCBIWebServiceClient ncbiClient = new
NCBIWebServiceClient("http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl","NCBI
Network Import Client","REST version of NCBI Web Service
Client.",cyNetworkFactoryServiceRef,cyDataTableFactoryServiceRef,cyNetworkManagerServiceRef,cyTableManagerServiceRef);
+ NCBITableImportClient ncbiTableImportClient = new
NCBITableImportClient("http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl","NCBI
Table Import Client","REST version of NCBI Web Service Client for importing
tables.",cyDataTableFactoryServiceRef,cyNetworkManagerServiceRef,cyApplicationManagerServiceRef,cyTableManagerServiceRef);
+ NCBITableImportAction ncbiTableImportAction = new
NCBITableImportAction(ncbiTableImportClient,taskManagerServiceRef,cyTableManagerServiceRef,cyNetworkManagerServiceRef,cyApplicationManagerRef);
+
+ registerAllServices(bc,ncbiClient, new Properties());
+ registerService(bc,ncbiTableImportAction,CyAction.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 22:46:45 UTC (rev 26831)
+++
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 22:49:56 UTC (rev 26832)
@@ -1,35 +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 Required Services -->
-
-
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:reference id="cyNetworkFactoryServiceRef"
- interface="org.cytoscape.model.CyNetworkFactory" />
- <osgi:reference id="cyNetworkManagerServiceRef"
- interface="org.cytoscape.model.CyNetworkManager" />
- <osgi:reference id="taskManagerServiceRef"
- interface="org.cytoscape.work.swing.GUITaskManager" />
-
- <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
- <osgi:reference id="cyDataTableFactoryServiceRef"
interface="org.cytoscape.model.CyTableFactory" />
-
- <!-- Application Manager -->
- <osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <!-- Export Network Import Client -->
- <osgi:service id="ncbiClientService" ref="ncbiClient"
- auto-export="interfaces" />
- <osgi:service id="ncbiTableImportClientService"
ref="ncbiTableImportAction"
- interface="org.cytoscape.application.swing.CyAction" />
-
-</beans>
Copied:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 22:49:56 UTC (rev 26832)
@@ -0,0 +1,35 @@
+<?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 Required Services -->
+
+
+ <osgi:reference id="cyApplicationManagerRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <osgi:reference id="cyNetworkFactoryServiceRef"
+ interface="org.cytoscape.model.CyNetworkFactory" />
+ <osgi:reference id="cyNetworkManagerServiceRef"
+ interface="org.cytoscape.model.CyNetworkManager" />
+ <osgi:reference id="taskManagerServiceRef"
+ interface="org.cytoscape.work.swing.GUITaskManager" />
+
+ <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+ <osgi:reference id="cyDataTableFactoryServiceRef"
interface="org.cytoscape.model.CyTableFactory" />
+
+ <!-- Application Manager -->
+ <osgi:reference id="cyApplicationManagerServiceRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <!-- Export Network Import Client -->
+ <osgi:service id="ncbiClientService" ref="ncbiClient"
+ auto-export="interfaces" />
+ <osgi:service id="ncbiTableImportClientService"
ref="ncbiTableImportAction"
+ interface="org.cytoscape.application.swing.CyAction" />
+
+</beans>
Deleted:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 22:46:45 UTC (rev 26831)
+++
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 22:49:56 UTC (rev 26832)
@@ -1,52 +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 />
-
- <!-- Network import client -->
- <bean id="ncbiClient"
class="org.cytoscape.webservice.ncbi.NCBIWebServiceClient">
- <constructor-arg
value="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl"; />
- <constructor-arg value="NCBI Network Import Client" />
- <constructor-arg value="REST version of NCBI Web Service
Client." />
- <constructor-arg ref="cyNetworkFactoryServiceRef" />
- <constructor-arg ref="cyDataTableFactoryServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyTableManagerServiceRef" />
- </bean>
-
-
- <bean id="ncbiTableImportClient"
class="org.cytoscape.webservice.ncbi.NCBITableImportClient">
- <constructor-arg
value="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl"; />
- <constructor-arg value="NCBI Table Import Client" />
- <constructor-arg value="REST version of NCBI Web Service Client
for importing tables." />
- <constructor-arg ref="cyDataTableFactoryServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="cyTableManagerServiceRef" />
- </bean>
-
- <!-- Table Import Action -->
- <bean id="ncbiTableImportAction"
class="org.cytoscape.webservice.ncbi.NCBITableImportAction">
- <constructor-arg ref="ncbiTableImportClient" />
- <constructor-arg ref="taskManagerServiceRef" />
- <constructor-arg ref="cyTableManagerServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyApplicationManagerRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 22:49:56 UTC (rev 26832)
@@ -0,0 +1,52 @@
+<?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 />
+
+ <!-- Network import client -->
+ <bean id="ncbiClient"
class="org.cytoscape.webservice.ncbi.NCBIWebServiceClient">
+ <constructor-arg
value="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl"; />
+ <constructor-arg value="NCBI Network Import Client" />
+ <constructor-arg value="REST version of NCBI Web Service
Client." />
+ <constructor-arg ref="cyNetworkFactoryServiceRef" />
+ <constructor-arg ref="cyDataTableFactoryServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyTableManagerServiceRef" />
+ </bean>
+
+
+ <bean id="ncbiTableImportClient"
class="org.cytoscape.webservice.ncbi.NCBITableImportClient">
+ <constructor-arg
value="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl"; />
+ <constructor-arg value="NCBI Table Import Client" />
+ <constructor-arg value="REST version of NCBI Web Service Client
for importing tables." />
+ <constructor-arg ref="cyDataTableFactoryServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyTableManagerServiceRef" />
+ </bean>
+
+ <!-- Table Import Action -->
+ <bean id="ncbiTableImportAction"
class="org.cytoscape.webservice.ncbi.NCBITableImportAction">
+ <constructor-arg ref="ncbiTableImportClient" />
+ <constructor-arg ref="taskManagerServiceRef" />
+ <constructor-arg ref="cyTableManagerServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerRef" />
+ </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.
