Bundle reorganising. Aber support added.

Author: tarelli

pom.xml

@@ -18,6 +18,11 @@
 			<artifactId>core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.geppetto</groupId>
+			<artifactId>simulation</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.core</artifactId>

src/main/java/META-INF/spring/osgi-config.xml

@@ -14,14 +14,14 @@
 	<osgi:service id="Neo4jDataSourceExporter" ref="neo4jDataSource"
 		interface="org.geppetto.core.datasources.IDataSourceService">
 	</osgi:service>
-	<bean id="neo4jDataSource" scope="prototype" class="org.geppetto.datasources.Neo4jDataSourceService">
+	<bean id="neo4jDataSource" scope="prototype" class="org.geppetto.datasources.neo4j.Neo4jDataSourceService">
 	<aop:scoped-proxy proxy-target-class="false"/>
 	</bean>
 
-	<osgi:service id="AmberOWLDataSourceExporter" ref="amberOWLDataSource"
+	<osgi:service id="AberOWLDataSourceExporter" ref="aberOWLDataSource"
 		interface="org.geppetto.core.datasources.IDataSourceService">
 	</osgi:service>
-	<bean id="amberOWLDataSource" scope="prototype" class="org.geppetto.datasources.AmberOWLDataSourceService">
+	<bean id="aberOWLDataSource" scope="prototype" class="org.geppetto.datasources.aberowl.AberOWLDataSourceService">
 	<aop:scoped-proxy proxy-target-class="false"/>
 	</bean>
 

src/main/java/org/geppetto/datasources/ADataSourceService.java

@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2011 - 2015 OpenWorm.
+ * http://openworm.org
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the MIT License
+ * which accompanies this distribution, and is available at
+ * http://opensource.org/licenses/MIT
+ *
+ * Contributors:
+ *     	OpenWorm - http://openworm.org/people.html
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights 
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+ * copies of the Software, and to permit persons to whom the Software is 
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in 
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************************************/
+package org.geppetto.datasources;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.geppetto.core.datasources.IDataSourceService;
+import org.geppetto.core.datasources.QueryChecker;
+import org.geppetto.core.model.GeppettoModelAccess;
+import org.geppetto.core.services.AService;
+import org.geppetto.model.DataSource;
+import org.geppetto.model.Query;
+import org.geppetto.model.variables.Variable;
+
+/**
+ * @author matteocantarelli
+ *
+ */
+public abstract class ADataSourceService extends AService implements IDataSourceService
+{
+
+	public enum ConnectionType
+	{
+		GET, POST
+	}
+
+	private DataSource configuration;
+
+	private String dataSourceTemplate;
+
+	private GeppettoModelAccess geppettoModelAccess;
+
+	public ADataSourceService(String dataSourceTemplate)
+	{
+		this.dataSourceTemplate = dataSourceTemplate;
+	}
+
+	@Override
+	public void initialize(DataSource configuration, GeppettoModelAccess geppettoModelAccess)
+	{
+		this.configuration = configuration;
+		this.geppettoModelAccess = geppettoModelAccess;
+	}
+
+	protected GeppettoModelAccess getGeppettoModelAccess()
+	{
+		return geppettoModelAccess;
+	}
+
+	protected String getTemplate()
+	{
+		return dataSourceTemplate;
+	}
+
+	/**
+	 * @return the configuration for this DataSourceService
+	 */
+	protected DataSource getConfiguration()
+	{
+		return configuration;
+	}
+
+	/**
+	 * @param url
+	 * @param queryString
+	 * @return
+	 */
+	protected String getQueryURL(String url, String queryString)
+	{
+		String queryURL = null;
+		// TODO Do we need a template? Plain concatenation?
+		return queryURL;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.geppetto.core.model.QueryProvider#getAvailableQueries(org.geppetto.model.variables.Variable)
+	 */
+	@Override
+	public List<Query> getAvailableQueries(Variable variable)
+	{
+		List<Query> availableQueries = new ArrayList<Query>();
+		for(Query query : configuration.getQueries())
+		{
+			if(QueryChecker.check(query, variable))
+			{
+				availableQueries.add(query);
+			}
+		}
+		return availableQueries;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.geppetto.core.services.IService#registerGeppettoService()
+	 */
+	@Override
+	public void registerGeppettoService() throws Exception
+	{
+		// Nothing to do here
+	}
+
+}

src/main/java/org/geppetto/datasources/DummyDataSourceService.java

@@ -32,7 +32,6 @@
  *******************************************************************************/
 package org.geppetto.datasources;
 
-import org.geppetto.core.datasources.ADataSourceService;
 import org.geppetto.core.datasources.GeppettoDataSourceException;
 import org.geppetto.core.datasources.IDataSourceService;
 import org.geppetto.core.datasources.IQueryListener;