Merge branch 'master' into livedemo

src/main/java/at/ac/tuwien/infosys/aic13/Main.java

@@ -10,6 +10,7 @@
 import org.slf4j.LoggerFactory;
 
 import at.ac.tuwien.infosys.aic13.cloudscale.service.SentimentAnalysisService;
+import at.ac.tuwien.infosys.aic13.cloudscale.service.impl.SentimentAnalysisServiceCloudScaleImpl;
 import at.ac.tuwien.infosys.aic13.cloudscale.service.impl.SentimentAnalysisServiceDummyImpl;
 import at.ac.tuwien.infosys.cloudscale.annotations.CloudScaleShutdown;
 

src/main/java/at/ac/tuwien/infosys/aic13/cloudscale/configuration/ConfigurationProvider.java

@@ -1,10 +1,10 @@
 package at.ac.tuwien.infosys.aic13.cloudscale.configuration;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 import java.util.logging.Level;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import at.ac.tuwien.infosys.aic13.cloudscale.events.TestEvent;
 import at.ac.tuwien.infosys.cloudscale.annotations.CloudScaleConfigurationProvider;
 import at.ac.tuwien.infosys.cloudscale.configuration.CloudScaleConfiguration;
@@ -16,65 +16,77 @@
  * @author e0756024 <[email protected]>
  */
 public class ConfigurationProvider {
-
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(ConfigurationProvider.class);
-
-    @CloudScaleConfigurationProvider
-    public static CloudScaleConfiguration getConfiguration() {
-//	return localConfig();
-	return getEC2Config();
-    }
-
-    /**
-     * @return config for local testing
-     */
-    @SuppressWarnings("unused")
-    private static CloudScaleConfiguration localConfig() {
-
-	CloudScaleConfiguration cfg = new CloudScaleConfigurationBuilder()
-		.withLogging(Level.WARNING) 
-		.with(new ScalingPolicyAlternative())
-		.withMonitoring(true)
-		.withMonitoringEvents(TestEvent.class)
-		.build();
 
-	//check every 60 seconds
-	cfg.common().setScaleDownIntervalInSec(60);
+	@CloudScaleConfigurationProvider
+	public static CloudScaleConfiguration getConfiguration() {
+		switch(getProperties().getProperty("g3p3.cloudScale.configurationProvider", "local")){
+			case "ec2":	
+				System.out.println("Using EC2-CloudScale Config (AHXIGO).");
+				return getEC2Config();
+			case "local": 
+			default: 
+				System.out.println("Using local CLoudScale Config (IT6Q81).");
+				return localConfig();
+		}
+	}
 
-	return cfg;
+	private static Properties getProperties() {
+		Properties properties = new Properties();
+		InputStream in = ConfigurationProvider.class.getClassLoader().getResourceAsStream(
+				"aic13g3p3.properties");
+		try {
+			properties.load(in);
+			in.close();
+		} catch (IOException e) {
+			System.err.println("Error while loading file 'aic13g3p3.properties' (025F2E). "+ e.getMessage());
+		}
+		return properties;
+	}
 
-    }
-
-    private static CloudScaleConfiguration getEC2Config() {
-
-	final String AWS_CONFIG = "aws.properties";
-	final String AWS_ENDPOINT = "ec2.ap-southeast-1.amazonaws.com";
-	final String AWS_INSTANCE_TYPE = "t1.micro";
-	final String AWS_KEY = "awscs";
-	final String AWS_IMAGE_NAME = "CloudScale_v0.3.2 G3P3";
-
-	// CHANGE ME
-	final String MQ_HOSTNAME = "ec2-54-251-13-247.ap-southeast-1.compute.amazonaws.com";
-	final int MQ_PORT = 61616;
-
-	EC2CloudPlatformConfiguration ec2Config = new EC2CloudPlatformConfiguration();
-	ec2Config.setAwsConfigFile(ClassLoader.getSystemResource(AWS_CONFIG).getPath());
-	ec2Config.setAwsEndpoint(AWS_ENDPOINT);
-        ec2Config.setInstanceType(AWS_INSTANCE_TYPE);
-        ec2Config.setSshKey(AWS_KEY);
-        ec2Config.setImageName(AWS_IMAGE_NAME);
-
-        CloudScaleConfiguration config = new CloudScaleConfigurationBuilder()
-        	.with(ec2Config)
-        	.with(new ScalingPolicyAlternative())
-        	.withMQServer(MQ_HOSTNAME, MQ_PORT)
-        	.withMonitoring(true)
-        	.withLogging(Level.OFF)
-        	.build();
-
-        config.common().setScaleDownIntervalInSec(20);
-
-        return config;
-    }
+	/**
+	 * @return config for local testing
+	 */
+	private static CloudScaleConfiguration localConfig() {
+
+		CloudScaleConfiguration cfg = new CloudScaleConfigurationBuilder()
+				.withLogging(Level.WARNING)
+				.with(new ScalingPolicyAlternative()).withMonitoring(true)
+				.withMonitoringEvents(TestEvent.class).build();
+
+		// check every 60 seconds
+		cfg.common().setScaleDownIntervalInSec(60);
+
+		return cfg;
+
+	}
+
+	private static CloudScaleConfiguration getEC2Config() {
+
+		final String AWS_CONFIG = "aws.properties";
+		final String AWS_ENDPOINT = "ec2.ap-southeast-1.amazonaws.com";
+		final String AWS_INSTANCE_TYPE = "t1.micro";
+		final String AWS_KEY = "awscs";
+		final String AWS_IMAGE_NAME = "CloudScale_v0.3.2 G3P3";
+
+		// CHANGE ME
+		final String MQ_HOSTNAME = "ec2-54-251-13-247.ap-southeast-1.compute.amazonaws.com";
+		final int MQ_PORT = 61616;
+
+		EC2CloudPlatformConfiguration ec2Config = new EC2CloudPlatformConfiguration();
+		ec2Config.setAwsConfigFile(ClassLoader.getSystemResource(AWS_CONFIG)
+				.getPath());
+		ec2Config.setAwsEndpoint(AWS_ENDPOINT);
+		ec2Config.setInstanceType(AWS_INSTANCE_TYPE);
+		ec2Config.setSshKey(AWS_KEY);
+		ec2Config.setImageName(AWS_IMAGE_NAME);
+
+		CloudScaleConfiguration config = new CloudScaleConfigurationBuilder()
+				.with(ec2Config).with(new ScalingPolicyAlternative())
+				.withMQServer(MQ_HOSTNAME, MQ_PORT).withMonitoring(true)
+				.withLogging(Level.OFF).build();
+
+		config.common().setScaleDownIntervalInSec(20);
+
+		return config;
+	}
 }

src/main/java/at/ac/tuwien/infosys/aic13/sentiment/WEKAFileProvider.java

@@ -0,0 +1,43 @@
+/*
+   Copyright 2013 Philipp Leitner
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package at.ac.tuwien.infosys.aic13.sentiment;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import at.ac.tuwien.infosys.cloudscale.annotations.FileDependency.DependentFile;
+import at.ac.tuwien.infosys.cloudscale.annotations.FileDependency.IFileDependencyProvider;
+
+public class WEKAFileProvider implements IFileDependencyProvider {
+
+	@Override
+	public DependentFile[] getDependentFiles() {
+
+		List<DependentFile> dependentFiles = new ArrayList<>();
+
+		for(File file : new File("files").listFiles()) {
+			if(file.isFile())
+				dependentFiles.add(new DependentFile(file.getPath()));
+		}
+
+		return dependentFiles.toArray(new DependentFile[0]);
+
+	}
+
+
+
+}

src/main/java/at/ac/tuwien/infosys/aic13/sentiment/impl/ClassifierImpl.java

@@ -12,6 +12,8 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+   Modified by Roman Khassraf <roman at khassraf.at>
 */
 package at.ac.tuwien.infosys.aic13.sentiment.impl;
 
@@ -57,7 +59,6 @@ public SentimentType classify(String text)
             }
             catch(Exception ex)
             {
-                // TODO: logging
                 return SentimentType.Neutral;
             }
         }

src/main/java/at/ac/tuwien/infosys/aic13/sentiment/impl/TwitterSentimentAnalyzerImpl.java

@@ -12,15 +12,19 @@
 import at.ac.tuwien.infosys.aic13.sentiment.Classifier;
 import at.ac.tuwien.infosys.aic13.sentiment.TwitterQuery;
 import at.ac.tuwien.infosys.aic13.sentiment.TwitterSentimentAnalyzer;
+import at.ac.tuwien.infosys.aic13.sentiment.WEKAFileProvider;
 import at.ac.tuwien.infosys.cloudscale.annotations.ByValueParameter;
 import at.ac.tuwien.infosys.cloudscale.annotations.CloudObject;
 import at.ac.tuwien.infosys.cloudscale.annotations.DestructCloudObject;
+import at.ac.tuwien.infosys.cloudscale.annotations.FileDependency;
+import at.ac.tuwien.infosys.cloudscale.annotations.FileDependency.FileAccess;
 
 /**
  *
  * @author Roman Khassraf <roman at khassraf.at>
  */
 @CloudObject
+@FileDependency(dependencyProvider = WEKAFileProvider.class, accessType = FileAccess.ReadOnly)
 public class TwitterSentimentAnalyzerImpl implements TwitterSentimentAnalyzer {
 
     private static final TwitterQuery twitterQuery = new WSTwitterQueryImpl();

src/main/resources/aic13g3p3.properties.template

@@ -4,4 +4,8 @@ g3p3.sentimentAnalysisServiceClass=at.ac.tuwien.infosys.aic13.cloudscale.service
 #g3p3.sentimentAnalysisServiceClass=at.ac.tuwien.infosys.aic13.cloudscale.service.impl.SentimentAnalysisServiceCloudScaleImpl
 
 # Delay between two sentimentAnalysis calls.
-g3p3.sentimentnalysis.delayms=5000
+g3p3.sentimentnalysis.delayms=5000
+
+# Cloudscale ConfigurationProvider
+# local | ec2
+g3p3.cloudScale.configurationProvider=ec2