Skip to content

Commit

Permalink
Merge pull request #10 from lambadaframework/develop
Browse files Browse the repository at this point in the history
Merge develop to master
  • Loading branch information
cagataygurturk committed Apr 19, 2016
2 parents 66c9324 + 607e7d8 commit 451e3c0
Show file tree
Hide file tree
Showing 25 changed files with 16 additions and 42 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ The configuration values should be present under maven plugin's configuration.
<plugin>
<groupId>org.lambadaframework</groupId>
<artifactId>maven-plugin</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
<configuration>
...
<!-- Configuration options -->
Expand Down
2 changes: 1 addition & 1 deletion jax-rs-extractor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.lambadaframework</groupId>
<artifactId>lambada</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
</parent>
<artifactId>jax-rs-extractor</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class JAXRSParserTest {
@Test
public void testScanJar() throws Exception {
JAXRSParser parser = new JAXRSParser().withJarFile(
"../stub-handlers/target/stub-handlers-0.0.3.jar",
"../stub-handlers/target/stub-handlers-0.0.4.jar",
"org.lambadaframework");
List<Resource> resourceList = parser.scan();
assertTrue(resourceList.size() > 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"DeploymentS3Bucket": {
"Description": "Deployment S3 Bucket is where project is deployed after mvn deploy command.",
"Type": "String",
"MinLength": "1",
"MaxLength": "25"
"MinLength": "3",
"MaxLength": "63"
},
"DeploymentS3Key": {
"Description": "Deployment S3 Key is the S3 Path where project is deployed after mvn deploy command.",
Expand Down
10 changes: 2 additions & 8 deletions maven-plugin/pom.xml → lambada-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.lambadaframework</groupId>
<artifactId>lambada</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
</parent>

<artifactId>maven-plugin</artifactId>
<artifactId>lambada-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

<properties>
Expand Down Expand Up @@ -42,12 +42,6 @@
<version>${aws-sdk.version}</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<version>${aws-sdk.version}</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ protected void deployMethods(Resource jerseyResource, com.amazonaws.services.api
/**
* To prevent TooManyRequestsException errors from API Gateway
*/
Thread.sleep(500);
Thread.sleep(1000);

if (log != null) {
log.info(methodToDelete + " method deleted on resource id " + apiGatewayResource.getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public class Cloudformation extends AWSTools {
" \"DeploymentS3Bucket\": {\n" +
" \"Description\": \"Deployment S3 Bucket is where project is deployed after mvn deploy command.\",\n" +
" \"Type\": \"String\",\n" +
" \"MinLength\": \"1\",\n" +
" \"MaxLength\": \"25\"\n" +
" \"MinLength\": \"3\",\n" +
" \"MaxLength\": \"63\"\n" +
" },\n" +
" \"DeploymentS3Key\": {\n" +
" \"Description\": \"Deployment S3 Key is the S3 Path where project is deployed after mvn deploy command.\",\n" +
Expand Down
2 changes: 1 addition & 1 deletion logger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lambada</artifactId>
<groupId>org.lambadaframework</groupId>
<version>0.0.3</version>
<version>0.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Log support</name>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.lambadaframework</groupId>
<artifactId>lambada</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -50,7 +50,7 @@
<module>stub-handlers</module>
<module>jax-rs-extractor</module>
<module>runtime</module>
<module>maven-plugin</module>
<module>lambada-maven-plugin</module>
<module>wagon</module>
</modules>

Expand Down
8 changes: 1 addition & 7 deletions runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.lambadaframework</groupId>
<artifactId>lambada</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
</parent>
<artifactId>runtime</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -43,12 +43,6 @@
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.ini4j</groupId>
<artifactId>ini4j</artifactId>
<version>${ini4j.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/org/lambadaframework/runtime/Handler.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import org.ini4j.Ini;
import org.ini4j.IniPreferences;
import org.lambadaframework.jaxrs.model.ResourceMethod;
import org.lambadaframework.logger.LambdaLogger;
import org.lambadaframework.runtime.errorhandling.ErrorHandler;
Expand All @@ -12,18 +10,6 @@
import org.lambadaframework.runtime.router.Router;
import org.apache.log4j.Logger;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;

import javax.xml.parsers.*;

import org.xml.sax.*;
import org.xml.sax.helpers.*;


public class Handler
implements RequestHandler<Request, Response> {
Expand Down
2 changes: 1 addition & 1 deletion stub-handlers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lambada</artifactId>
<groupId>org.lambadaframework</groupId>
<version>0.0.3</version>
<version>0.0.4</version>
</parent>
<name>Stub Handlers for Tests</name>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion wagon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>lambada</artifactId>
<groupId>org.lambadaframework</groupId>
<version>0.0.3</version>
<version>0.0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>S3 Wagon</name>
Expand Down

0 comments on commit 451e3c0

Please sign in to comment.