Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bioclipse/bioclipse.opentox
base: bd06066
...
head fork: bioclipse/bioclipse.opentox
compare: 1d40d13
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 20 files changed
  • 0 commit comments
  • 1 contributor
Showing with 14 additions and 394 deletions.
  1. +0 −14 features/net.bioclipse.opentox_feature/feature.xml
  2. +0 −7 plugins/net.bioclipse.opentox.ideaconsult/.classpath
  3. +0 −28 plugins/net.bioclipse.opentox.ideaconsult/.project
  4. +0 −25 plugins/net.bioclipse.opentox.ideaconsult/META-INF/MANIFEST.MF
  5. +0 −3  plugins/net.bioclipse.opentox.ideaconsult/build.properties
  6. +0 −15 plugins/net.bioclipse.opentox.ideaconsult/plugin.xml
  7. +0 −49 plugins/net.bioclipse.opentox.ideaconsult/src/net/bioclipse/opentox/ideaconsult/Activator.java
  8. +0 −7 plugins/net.bioclipse.opentox.localhost/.classpath
  9. +0 −28 plugins/net.bioclipse.opentox.localhost/.project
  10. +0 −25 plugins/net.bioclipse.opentox.localhost/META-INF/MANIFEST.MF
  11. +0 −3  plugins/net.bioclipse.opentox.localhost/build.properties
  12. +0 −15 plugins/net.bioclipse.opentox.localhost/plugin.xml
  13. +0 −49 plugins/net.bioclipse.opentox.localhost/src/net/bioclipse/opentox/localhost/Activator.java
  14. +0 −7 plugins/net.bioclipse.opentox.tumuenchen/.classpath
  15. +0 −28 plugins/net.bioclipse.opentox.tumuenchen/.project
  16. +0 −25 plugins/net.bioclipse.opentox.tumuenchen/META-INF/MANIFEST.MF
  17. +0 −3  plugins/net.bioclipse.opentox.tumuenchen/build.properties
  18. +0 −14 plugins/net.bioclipse.opentox.tumuenchen/plugin.xml
  19. +0 −49 plugins/net.bioclipse.opentox.tumuenchen/src/net/bioclipse/opentox/tumuenchen/Activator.java
  20. +14 −0 plugins/net.bioclipse.opentox/plugin.xml
View
14 features/net.bioclipse.opentox_feature/feature.xml
@@ -49,18 +49,4 @@ Eclipse Public License.
version="0.0.0"
unpack="false"/>
- <plugin
- id="net.bioclipse.opentox.ideaconsult"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="net.bioclipse.opentox.tumuenchen"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
View
7 plugins/net.bioclipse.opentox.ideaconsult/.classpath
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
View
28 plugins/net.bioclipse.opentox.ideaconsult/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>net.bioclipse.opentox.ideaconsult</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
25 plugins/net.bioclipse.opentox.ideaconsult/META-INF/MANIFEST.MF
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: IdeaConsult Ltd. OpenTox Server Plugin
-Bundle-SymbolicName: net.bioclipse.opentox.ideaconsult; singleton:=true
-Bundle-Version: 2.5.0.qualifier
-Bundle-Activator: net.bioclipse.opentox.ideaconsult.Activator
-Export-Package: net.bioclipse.opentox.ideaconsult
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- net.bioclipse.core,
- net.bioclipse.scripting,
- org.springframework.bundle.spring.aop,
- net.sf.cglib,
- org.springframework.osgi.aopalliance.osgi,
- net.bioclipse.rdf,
- net.bioclipse.business,
- org.eclipse.core.resources,
- net.bioclipse.opentox,
- net.bioclipse.usermanager
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.apache.commons.codec,
- org.apache.commons.logging,
- org.apache.log4j
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
View
3  plugins/net.bioclipse.opentox.ideaconsult/build.properties
@@ -1,3 +0,0 @@
-bin.includes = plugin.xml,\
- META-INF/,\
- .
View
15 plugins/net.bioclipse.opentox.ideaconsult/plugin.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension
- point="net.bioclipse.opentox">
- <service
- id="net.bioclipse.opentox.ideaconsult"
- name="IdeaConsult Ltd. OpenTox Server"
- serviceURL="http://apps.ideaconsult.net:8080/ambit2/"
- serviceSPARQL="http://apps.ideaconsult.net:8080/ontology/">
- </service>
- </extension>
-
-</plugin>
View
49 plugins/net.bioclipse.opentox.ideaconsult/src/net/bioclipse/opentox/ideaconsult/Activator.java
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Egon Willighagen <egonw@users.sf.net>
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contact: http://www.bioclipse.net/
- ******************************************************************************/
-package net.bioclipse.opentox.ideaconsult;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "net.bioclipse.opentox.localhost";
-
- // The shared instance
- private static Activator plugin;
-
- public Activator() {}
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
-
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
View
7 plugins/net.bioclipse.opentox.localhost/.classpath
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
View
28 plugins/net.bioclipse.opentox.localhost/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>net.bioclipse.opentox.localhost</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
25 plugins/net.bioclipse.opentox.localhost/META-INF/MANIFEST.MF
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Localhost OpenTox Plugin
-Bundle-SymbolicName: net.bioclipse.opentox.localhost; singleton:=true
-Bundle-Version: 2.5.0.qualifier
-Bundle-Activator: net.bioclipse.opentox.localhost.Activator
-Export-Package: net.bioclipse.opentox.localhost
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- net.bioclipse.core,
- net.bioclipse.scripting,
- org.springframework.bundle.spring.aop,
- net.sf.cglib,
- org.springframework.osgi.aopalliance.osgi,
- net.bioclipse.rdf,
- net.bioclipse.business,
- org.eclipse.core.resources,
- net.bioclipse.opentox,
- net.bioclipse.usermanager
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.apache.commons.codec,
- org.apache.commons.logging,
- org.apache.log4j
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
View
3  plugins/net.bioclipse.opentox.localhost/build.properties
@@ -1,3 +0,0 @@
-bin.includes = plugin.xml,\
- META-INF/,\
- .
View
15 plugins/net.bioclipse.opentox.localhost/plugin.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension
- point="net.bioclipse.opentox">
- <service
- id="net.bioclipse.opentox.localhost"
- name="Ambit2 - Localhost"
- serviceURL="http://localhost:8080/ambit2/"
- serviceSPARQL="http://localhost:8080/ontology/">
- </service>
- </extension>
-
-</plugin>
View
49 plugins/net.bioclipse.opentox.localhost/src/net/bioclipse/opentox/localhost/Activator.java
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Egon Willighagen <egonw@users.sf.net>
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contact: http://www.bioclipse.net/
- ******************************************************************************/
-package net.bioclipse.opentox.localhost;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "net.bioclipse.opentox.localhost";
-
- // The shared instance
- private static Activator plugin;
-
- public Activator() {}
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
-
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
View
7 plugins/net.bioclipse.opentox.tumuenchen/.classpath
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
View
28 plugins/net.bioclipse.opentox.tumuenchen/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>net.bioclipse.opentox.tumuenchen</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
25 plugins/net.bioclipse.opentox.tumuenchen/META-INF/MANIFEST.MF
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: TU Muenchen OpenTox Server Plugin
-Bundle-SymbolicName: net.bioclipse.opentox.tumuenchen; singleton:=true
-Bundle-Version: 2.5.0.qualifier
-Bundle-Activator: net.bioclipse.opentox.tumuenchen.Activator
-Export-Package: net.bioclipse.opentox.tumuenchen
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- net.bioclipse.core,
- net.bioclipse.scripting,
- org.springframework.bundle.spring.aop,
- net.sf.cglib,
- org.springframework.osgi.aopalliance.osgi,
- net.bioclipse.rdf,
- net.bioclipse.business,
- org.eclipse.core.resources,
- net.bioclipse.opentox,
- net.bioclipse.usermanager
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.apache.commons.codec,
- org.apache.commons.logging,
- org.apache.log4j
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
View
3  plugins/net.bioclipse.opentox.tumuenchen/build.properties
@@ -1,3 +0,0 @@
-bin.includes = plugin.xml,\
- META-INF/,\
- .
View
14 plugins/net.bioclipse.opentox.tumuenchen/plugin.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension
- point="net.bioclipse.opentox">
- <service
- id="net.bioclipse.opentox.tumuenchen"
- name="TU Muenchen OpenTox Server"
- serviceURL="http://opentox.informatik.tu-muenchen.de:8080/OpenTox-dev/">
- </service>
- </extension>
-
-</plugin>
View
49 plugins/net.bioclipse.opentox.tumuenchen/src/net/bioclipse/opentox/tumuenchen/Activator.java
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Egon Willighagen <egonw@users.sf.net>
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contact: http://www.bioclipse.net/
- ******************************************************************************/
-package net.bioclipse.opentox.tumuenchen;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "net.bioclipse.opentox.localhost";
-
- // The shared instance
- private static Activator plugin;
-
- public Activator() {}
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
-
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
View
14 plugins/net.bioclipse.opentox/plugin.xml
@@ -26,6 +26,20 @@
</extension>
<extension
+ point="net.bioclipse.opentox">
+ <service
+ id="net.bioclipse.opentox.ambit2"
+ name="Ambit2"
+ serviceURL="http://apps.ideaconsult.net:8080/ambit2/"
+ serviceSPARQL="http://apps.ideaconsult.net:8080/ontology/">
+ </service>
+ <service
+ id="net.bioclipse.opentox.tum"
+ name="TUM"
+ serviceURL="http://opentox.informatik.tu-muenchen.de:8080/OpenTox-dev/">
+ </service>
+ </extension>
+ <extension
point="net.bioclipse.usermanager.accountType">
<AccountType
id="net.bioclipse.opentox.OpenSSOAccount"

No commit comments for this range

Something went wrong with that request. Please try again.