Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala-lagom -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagom -o samples/server/petstore/scala-lagom"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala-lagom-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagom-server -o samples/server/petstore/scala-lagom-server"

java $JAVA_OPTS -jar $executable $ags
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ If Not Exist %executable% (
)

REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagom -o samples\server\petstore\scala-lagom
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagom-server -o samples\server\petstore\scala-lagom-server

java %JAVA_OPTS% -jar %executable% %ags%
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod
private String authScheme = "";
private boolean authPreemptive=false;
protected String groupId = "io.swagger";
protected String artifactId = "scala-lagom";
protected String artifactId = "scala-lagom-server";
protected String artifactVersion = "1.0.0";

public ScalaLagomServerCodegen() {
super();
outputFolder = "generated-code/scala-lagom";
outputFolder = "generated-code/scala-lagom-server";
modelTemplateFiles.put("model.mustache", ".scala");
apiTemplateFiles.put("api.mustache", ".scala");
embeddedTemplateDir = templateDir = "scala-lagom";
embeddedTemplateDir = templateDir = "scala-lagom-server";
apiPackage = "io.swagger.client.api";
modelPackage = "io.swagger.client.model";

Expand Down Expand Up @@ -166,7 +166,7 @@ public CodegenType getTag() {

@Override
public String getName() {
return "scala-lagom";
return "scala-lagom-server";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.circleci
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@
<module>samples/server/petstore/jaxrs-cxf-non-spring-app</module>
<module>samples/server/petstore/java-msf4j</module>
<module>samples/server/petstore/jaxrs-spec-interface</module>
<module>samples/server/petstore/scala-lagom</module>
<module>samples/server/petstore/scala-lagom-server</module>
</modules>
</profile>
</profiles>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version := "1.0.0"

name := "scala-lagom"
name := "scala-lagom-server"

organization := "io.swagger"

Expand Down