Author: jm
Date: 2011-09-23 10:18:16 -0700 (Fri, 23 Sep 2011)
New Revision: 26947
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/CyActivator.java.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/CyActivator.java.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/CyActivator.java.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/CyActivator.java.patch
Removed:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
Modified:
csplugins/trunk/toronto/jm/paperwing-build/build.sh
Log:
Updated paperwing-build so it doesn't use Spring-DM
Modified: csplugins/trunk/toronto/jm/paperwing-build/build.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-09-23 16:20:44 UTC
(rev 26946)
+++ csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-09-23 17:18:16 UTC
(rev 26947)
@@ -52,10 +52,10 @@
pushd distribution/target/cytoscape-*/cytoscape-*/
# Copy over our bundles
-cp ${DIST_DIR}/*.jar bundles/plugins
+cp ${DIST_DIR}/*.jar bundles/startlevel-55
# Remove ding bundles
-rm bundles/startlevel-3/ding-*
+rm bundles/startlevel-*/ding-*
popd
popd
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/CyActivator.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/CyActivator.java.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/CyActivator.java.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -0,0 +1,13 @@
+Index: src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
+===================================================================
+--- src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
(revision 26946)
++++ src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
(working copy)
+@@ -18,7 +18,7 @@
+
+ CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+
+- RenderingEngineManagerImpl renderingEngineManager = new
RenderingEngineManagerImpl();
++ RenderingEngineManagerImpl renderingEngineManager = new
RenderingEngineManagerImpl(cyEventHelperServiceRef);
+
+ Properties renderingEngineManagerProps = new Properties();
+
renderingEngineManagerProps.setProperty("service.type","manager");
Deleted:
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
2011-09-23 16:20:44 UTC (rev 26946)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/presentation-impl/bundle-context.xml.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -1,12 +0,0 @@
-Index: src/main/resources/META-INF/spring/bundle-context.xml
-===================================================================
---- src/main/resources/META-INF/spring/bundle-context.xml (revision 26266)
-+++ src/main/resources/META-INF/spring/bundle-context.xml (working copy)
-@@ -12,6 +12,7 @@
- <!-- Rendering Engine Manager service bean -->
- <bean id="renderingEngineManager"
-
class="org.cytoscape.view.presentation.internal.RenderingEngineManagerImpl">
-+ <constructor-arg ref="cyEventHelperServiceRef" />
- </bean>
-
- </beans>
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/CyActivator.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/CyActivator.java.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/CyActivator.java.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -0,0 +1,30 @@
+Index: src/main/java/org/cytoscape/internal/CyActivator.java
+===================================================================
+--- src/main/java/org/cytoscape/internal/CyActivator.java (revision 26946)
++++ src/main/java/org/cytoscape/internal/CyActivator.java (working copy)
+@@ -170,12 +170,12 @@
+ CyNetworkManager cyNetworkManagerServiceRef = getService(bc,
CyNetworkManager.class);
+ CyNetworkNaming cyNetworkNamingServiceRef = getService(bc,
CyNetworkNaming.class);
+ GUITaskManager taskManagerServiceRef = getService(bc,
GUITaskManager.class);
+- RenderingEngineFactory dingRenderingEngineFactoryServiceRef =
getService(bc,
++ RenderingEngineFactory windRenderingEngineFactoryServiceRef =
getService(bc,
+
RenderingEngineFactory.class,
+-
"(id=ding)");
+- RenderingEngineFactory
dingNavigationPresentationFactoryServiceRef = getService(bc,
++
"(id=wind)");
++ RenderingEngineFactory
windNavigationPresentationFactoryServiceRef = getService(bc,
+
RenderingEngineFactory.class,
+-
"(id=dingNavigation)");
++
"(id=windMap)");
+ GUITunableInterceptor tunableGUIInterceptorServiceRef =
getService(bc,
+
GUITunableInterceptor.class);
+ CyProperty bookmarkServiceRef = getService(bc, CyProperty.class,
+@@ -218,7 +218,7 @@
+
cyHelpBroker);
+ BirdsEyeViewHandler birdsEyeViewHandler = new
BirdsEyeViewHandler(cyApplicationManagerServiceRef,
+
networkViewManager,
+-
dingNavigationPresentationFactoryServiceRef);
++
windNavigationPresentationFactoryServiceRef);
+ NetworkPanel networkPanel = new
NetworkPanel(cyApplicationManagerServiceRef,
+
cyNetworkManagerServiceRef,
+
cyNetworkViewManagerServiceRef,
Deleted:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
2011-09-23 16:20:44 UTC (rev 26946)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context-osgi.xml.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -1,23 +0,0 @@
-Index: src/main/resources/META-INF/spring/bundle-context-osgi.xml
-===================================================================
---- src/main/resources/META-INF/spring/bundle-context-osgi.xml (revision 25942)
-+++ src/main/resources/META-INF/spring/bundle-context-osgi.xml (working copy)
-@@ -31,14 +31,14 @@
- interface="org.cytoscape.work.swing.GUITaskManager" />
-
- <!-- Rendering Engine factory for main network views -->
-- <osgi:reference id="dingRenderingEngineFactoryServiceRef"
-+ <osgi:reference id="windRenderingEngineFactoryServiceRef"
-
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
-- filter="(id=ding)" />
-+ filter="(id=wind)" />
-
- <!-- Rendering Engine factory for navigation views -->
-- <osgi:reference id="dingNavigationPresentationFactoryServiceRef"
-+ <osgi:reference id="windMapRenderingEngineFactoryServiceRef"
-
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
-- filter="(id=dingNavigation)" />
-+ filter="(id=windMap)" />
-
- <osgi:reference id="tunableGUIInterceptorServiceRef"
- interface="org.cytoscape.work.swing.GUITunableInterceptor" />
Deleted:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
2011-09-23 16:20:44 UTC (rev 26946)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/bundle-context.xml.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -1,13 +0,0 @@
-Index: src/main/resources/META-INF/spring/bundle-context.xml
-===================================================================
---- src/main/resources/META-INF/spring/bundle-context.xml (revision 25942)
-+++ src/main/resources/META-INF/spring/bundle-context.xml (working copy)
-@@ -87,7 +87,7 @@
- <bean name="birdsEyeViewHandler"
class="org.cytoscape.internal.view.BirdsEyeViewHandler">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="networkViewManager" />
-- <constructor-arg
ref="dingNavigationPresentationFactoryServiceRef" />
-+ <constructor-arg ref="windMapRenderingEngineFactoryServiceRef"
/>
- </bean>
-
- <bean name="networkPanel"
class="org.cytoscape.internal.view.NetworkPanel">
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/CyActivator.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/CyActivator.java.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/CyActivator.java.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -0,0 +1,22 @@
+Index: impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
+===================================================================
+--- impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
(revision 26946)
++++ impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
(working copy)
+@@ -6,7 +6,6 @@
+
+ import org.cytoscape.view.model.internal.CyNetworkViewManagerImpl;
+
+-import org.cytoscape.view.model.CyNetworkViewFactory;
+
+
+ import org.osgi.framework.BundleContext;
+@@ -27,6 +26,9 @@
+ CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+ CyServiceRegistrar cyServiceRegistrarRef =
getService(bc,CyServiceRegistrar.class);
+
++ NetworkViewFactoryImpl networkViewFactoryImpl = new
NetworkViewFactoryImpl(cyEventHelperServiceRef, cyServiceRegistrarRef);
++ registerAllServices(bc, networkViewFactoryImpl, new
Properties());
++
+ CyNetworkViewManagerImpl cyNetworkViewManager = new
CyNetworkViewManagerImpl(cyEventHelperServiceRef);
+
+ registerAllServices(bc,cyNetworkViewManager, new Properties());
Deleted:
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
2011-09-23 16:20:44 UTC (rev 26946)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -1,17 +0,0 @@
-Index: impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
-===================================================================
---- impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
(revision 26871)
-+++ impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
(working copy)
-@@ -11,6 +11,12 @@
- interface="org.cytoscape.service.util.CyServiceRegistrar" />
-
- <!-- Export Beans as Services -->
-+ <osgi:service id="cyNetworkViewFactoryService"
ref="cyNetworkViewFactory"
-+ interface="org.cytoscape.view.model.CyNetworkViewFactory">
-+ <osgi:service-properties>
-+ <entry key="service.type" value="factory" />
-+ </osgi:service-properties>
-+ </osgi:service>
-
- <osgi:service id="cyNetworkViewManagerService"
ref="cyNetworkViewManager"
- auto-export="interfaces">
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/CyActivator.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/CyActivator.java.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/CyActivator.java.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -0,0 +1,15 @@
+Index: src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
+===================================================================
+--- src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
(revision 26946)
++++ src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
(working copy)
+@@ -88,8 +88,8 @@
+ CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,CyApplicationConfiguration.class);
+ GUITaskManager taskManagerServiceRef =
getService(bc,GUITaskManager.class);
+ VisualStyleFactory visualStyleFactoryServiceRef =
getService(bc,VisualStyleFactory.class);
+- VisualLexicon dingVisualLexiconServiceRef =
getService(bc,VisualLexicon.class,"(id=ding)");
+- RenderingEngineFactory dingRenderingEngineFactoryServiceRef =
getService(bc,RenderingEngineFactory.class,"(id=ding)");
++ VisualLexicon dingVisualLexiconServiceRef =
getService(bc,VisualLexicon.class,"(id=wind)");
++ RenderingEngineFactory dingRenderingEngineFactoryServiceRef =
getService(bc,RenderingEngineFactory.class,"(id=wind)");
+ VisualMappingManager vmmServiceRef =
getService(bc,VisualMappingManager.class);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
Deleted:
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
2011-09-23 16:20:44 UTC (rev 26946)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/vizmap-gui-impl/bundle-context-osgi-vizmapper.xml.patch
2011-09-23 17:18:16 UTC (rev 26947)
@@ -1,21 +0,0 @@
-Index: src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
-===================================================================
---- src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
(revision 25942)
-+++ src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
(working copy)
-@@ -53,12 +53,12 @@
- interface="org.cytoscape.view.vizmap.VisualStyleFactory" />
-
- <!-- For now, use DING rendering engine only. -->
-- <osgi:reference id="dingVisualLexiconServiceRef"
-- interface="org.cytoscape.view.model.VisualLexicon"
filter="(id=ding)" />
-+ <osgi:reference id="windVisualLexiconServiceRef"
-+ interface="org.cytoscape.view.model.VisualLexicon"
filter="(id=wind)" />
-
-- <osgi:reference id="dingRenderingEngineFactoryServiceRef"
-+ <osgi:reference id="windRenderingEngineFactoryServiceRef"
-
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
-- filter="(id=ding)" />
-+ filter="(id=wind)" />
-
- <!-- Visual Mapping Manager Service -->
- <osgi:reference id="vmmServiceRef"
--
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.
