adapted net.bc.opsin for HEADLESS branch

bioclipse · Mar 1, 2011 · a0e4b77 · a0e4b77
1 parent 5eaa28d
commit a0e4b77
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/plugins/net.bioclipse.opsin/META-INF/MANIFEST.MF b/plugins/net.bioclipse.opsin/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui,
  org.springframework.bundle.spring.aop,
  net.sf.cglib,
  org.springframework.osgi.aopalliance.osgi,
- net.bioclipse.cdk.business
+ net.bioclipse.cdk.business,
+ net.bioclipse.core.api;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

diff --git a/plugins/net.bioclipse.opsin/META-INF/spring/context.xml b/plugins/net.bioclipse.opsin/META-INF/spring/context.xml
@@ -15,16 +15,16 @@
                 interface="net.bioclipse.opsin.business.IJavaScriptOpsinManager" />
 
   <osgi:reference id="recordingAdvice"
-                  interface="net.bioclipse.recording.IRecordingAdvice" />
+                  interface="net.bioclipse.core.api.recording.IRecordingAdvice" />
 
   <osgi:reference id="javaManagerDispatcherAdvisor"
-                  interface="net.bioclipse.managers.business.IJavaManagerDispatcherAdvisor" />
+                  interface="net.bioclipse.core.api.managers.IJavaManagerDispatcherAdvisor" />
 
   <osgi:reference id="javaScriptManagerDispatcherAdvisor"
-                  interface="net.bioclipse.managers.business.IJavaScriptManagerDispatcherAdvisor" />
+                  interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" />
 
   <osgi:reference id="wrapInProxyAdvice"
-                  interface="net.bioclipse.recording.IWrapInProxyAdvice" />
+                  interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" />
 
   <bean id="recordingAdvisor"
         class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">

diff --git a/plugins/net.bioclipse.opsin/src/net/bioclipse/opsin/business/IJavaScriptOpsinManager.java b/plugins/net.bioclipse.opsin/src/net/bioclipse/opsin/business/IJavaScriptOpsinManager.java
@@ -10,7 +10,8 @@
  ******************************************************************************/
 package net.bioclipse.opsin.business;
 
-import net.bioclipse.managers.business.IBioclipseJSManager;
+import net.bioclipse.core.api.managers.IBioclipseJSManager;
+
 
 public interface IJavaScriptOpsinManager
        extends IOpsinManager, IBioclipseJSManager {

diff --git a/plugins/net.bioclipse.opsin/src/net/bioclipse/opsin/business/IOpsinManager.java b/plugins/net.bioclipse.opsin/src/net/bioclipse/opsin/business/IOpsinManager.java
@@ -11,9 +11,9 @@
 package net.bioclipse.opsin.business;
 
 import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.PublishedClass;
-import net.bioclipse.core.PublishedMethod;
-import net.bioclipse.managers.business.IBioclipseManager;
+import net.bioclipse.core.api.managers.IBioclipseManager;
+import net.bioclipse.core.api.managers.PublishedClass;
+import net.bioclipse.core.api.managers.PublishedMethod;
 
 @PublishedClass(
     value="Manager for the OPSIN functionality to convert IUPAC names into " +

diff --git a/plugins/net.bioclipse.opsin/src/net/bioclipse/opsin/business/OpsinManager.java b/plugins/net.bioclipse.opsin/src/net/bioclipse/opsin/business/OpsinManager.java
@@ -14,8 +14,8 @@
 
 import net.bioclipse.cdk.business.CDKManager;
 import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.managers.business.IBioclipseManager;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.managers.IBioclipseManager;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;