Permalink
Browse files

restructure repository, separate extension and examples, fixes #23

* create camunda-bpm-spring-boot-starter-extension-root module
* move starters to extension
* add LICENSE
* rename documentation to "docs"
  • Loading branch information...
jangalinski committed Sep 18, 2015
1 parent 42ce6fa commit e9e630f329a0e9503055d17f898887698e4fab2d
Showing with 272 additions and 21 deletions.
  1. +1 −1 .java-version
  2. +4 −4 LICENSE
  3. +2 −2 README.md
  4. 0 {camunda-spring-boot-starter-docs → docs}/pom.xml
  5. 0 {camunda-spring-boot-starter-docs → docs}/src/main/asciidoc/index.adoc
  6. +4 −7 { → extension}/camunda-spring-boot-starter-rest/pom.xml
  7. 0 ...amunda-spring-boot-starter-rest/src/test/java/my/own/custom/spring/boot/project/JerseyConfig.java
  8. 0 ...spring-boot-starter-rest/src/test/java/my/own/custom/spring/boot/project/ProcessStartService.java
  9. 0 ...ot-starter-rest/src/test/java/my/own/custom/spring/boot/project/SampleCamundaRestApplication.java
  10. 0 ...st/src/test/java/org/camunda/bpm/extension/spring/boot/rest/SampleCamundaRestApplicationTest.java
  11. 0 { → extension}/camunda-spring-boot-starter-rest/src/test/resources/application.properties
  12. 0 { → extension}/camunda-spring-boot-starter-rest/src/test/resources/bpmn/test.bpmn
  13. +1 −1 { → extension}/camunda-spring-boot-starter/pom.xml
  14. 0 ...ot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmActuatorConfiguration.java
  15. 0 ...g-boot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmAutoConfiguration.java
  16. 0 ...pring-boot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmConfiguration.java
  17. 0 ...oot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmManagementProperties.java
  18. 0 ...oot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmPluginsConfiguration.java
  19. 0 ...a-spring-boot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmProperties.java
  20. 0 ...g-boot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/CamundaBpmRestConfiguration.java
  21. 0 ...ot-starter/src/main/java/org/camunda/bpm/spring/boot/starter/SpringBootProcessEngineProvider.java
  22. 0 ...tarter/src/main/java/org/camunda/bpm/spring/boot/starter/actuator/JobExecutorHealthIndicator.java
  23. 0 ...rter/src/main/java/org/camunda/bpm/spring/boot/starter/actuator/ProcessEngineHealthIndicator.java
  24. 0 ...starter/src/main/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaConfiguration.java
  25. 0 ...c/main/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaDatasourceConfiguration.java
  26. 0 ...c/main/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaDeploymentConfiguration.java
  27. 0 .../src/main/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaHistoryConfiguration.java
  28. 0 ...rter/src/main/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaJobConfiguration.java
  29. 0 ...rter/src/main/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaJpaConfiguration.java
  30. 0 ...ain/java/org/camunda/bpm/spring/boot/starter/configuration/CamundaProcessEngineConfiguration.java
  31. 0 ...ain/java/org/camunda/bpm/spring/boot/starter/configuration/impl/AbstractCamundaConfiguration.java
  32. 0 ...n/java/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultDatasourceConfiguration.java
  33. 0 ...n/java/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultDeploymentConfiguration.java
  34. 0 ...main/java/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultHistoryConfiguration.java
  35. 0 ...src/main/java/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultJobConfiguration.java
  36. 0 ...src/main/java/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultJpaConfiguration.java
  37. 0 ...ava/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultProcessEngineConfiguration.java
  38. 0 ...a/org/camunda/bpm/spring/boot/starter/runlistener/AbstractFinishedWithNoExceptionRunListener.java
  39. 0 ...starter/src/main/java/org/camunda/bpm/spring/boot/starter/runlistener/JobExecutorRunListener.java
  40. 0 ...tarter/src/main/resources/META-INF/services/org.camunda.bpm.engine.rest.spi.ProcessEngineProvider
  41. 0 { → extension}/camunda-spring-boot-starter/src/main/resources/META-INF/spring.factories
  42. 0 { → extension}/camunda-spring-boot-starter/src/main/resources/banner.txt
  43. 0 ...starter/src/test/java/org/camunda/bpm/spring/boot/starter/AbstractCamundaAutoConfigurationIT.java
  44. 0 ...tarter/src/test/java/org/camunda/bpm/spring/boot/starter/AdditionalCammundaBpmConfigurations.java
  45. 0 ...ng-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaAutoConfigurationIT.java
  46. 0 ...-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaBpmActuatorConfigurationIT.java
  47. 0 ...g-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaBpmConfigurationTest.java
  48. 0 ...ring-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaBpmPropertiesTest.java
  49. 0 ...boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaBpmRestConfigurationIT.java
  50. 0 ...boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaJpaAutoConfigurationIT.java
  51. 0 ...r/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaNoJobExecutionAutoConfigurationIT.java
  52. 0 ...ot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/CamundaNoJpaAutoConfigurationIT.java
  53. 0 ...er/src/test/java/org/camunda/bpm/spring/boot/starter/actuator/JobExecutorHealthIndicatorTest.java
  54. 0 .../src/test/java/org/camunda/bpm/spring/boot/starter/actuator/ProcessEngineHealthIndicatorTest.java
  55. 0 ...va/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultDatasourceConfigurationTest.java
  56. 0 ...va/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultDeploymentConfigurationTest.java
  57. 0 .../java/org/camunda/bpm/spring/boot/starter/configuration/impl/DefaultHistoryConfigurationTest.java
  58. 0 ...ter/src/test/java/org/camunda/bpm/spring/boot/starter/runlistener/JobExecutorRunListenerTest.java
  59. 0 ...-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/test/TestActuatorApplication.java
  60. 0 ...a-spring-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/test/TestApplication.java
  61. 0 ...starter/src/test/java/org/camunda/bpm/spring/boot/starter/test/TestNoJobExecutionApplication.java
  62. 0 ...ing-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/test/TestNoJpaApplication.java
  63. 0 ...ring-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/test/TestRestApplication.java
  64. 0 ...ng-boot-starter/src/test/java/org/camunda/bpm/spring/boot/starter/test/jpa/domain/TestEntity.java
  65. 0 ...r/src/test/java/org/camunda/bpm/spring/boot/starter/test/jpa/repository/TestEntityRepository.java
  66. 0 ...rter/src/test/java/org/camunda/bpm/spring/boot/starter/test/service/TransactionalTestService.java
  67. 0 .../src/test/java/org/camunda/bpm/spring/boot/starter/test/service/TransactionalTestServiceImpl.java
  68. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/application-nojobexecution.properties
  69. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/application-nojpa.properties
  70. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/application.properties
  71. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/bpmn/test.bpmn
  72. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/bpmn/test.bpmn20.xml
  73. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/cmmn/test.cmmn
  74. 0 { → extension}/camunda-spring-boot-starter/src/test/resources/cmmn/test.cmmn10.xml
  75. +257 −0 extension/pom.xml
  76. +2 −5 pom.xml
  77. +1 −1 publish-docs.sh
View
@@ -1 +1 @@
1.6
1.7
View
@@ -1,3 +1,4 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -178,15 +179,15 @@
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner}
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -198,5 +199,4 @@
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.
limitations under the License.
View
@@ -23,7 +23,7 @@ See [Documentation](https://camunda.github.io/camunda-bpm-spring-boot-starter)
* _[Jan Galinski](https://github.com/jangalinski)_
* _[Christian Lipphardt](https://github.com/hawky-4s-)_
## License
Apache License, Version 2.0
* [Apache License, Version 2.0](./LICENSE)
File renamed without changes.
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>camunda-bpm-spring-boot-starter-root</artifactId>
<artifactId>camunda-bpm-spring-boot-starter-extension-root</artifactId>
<groupId>org.camunda.bpm.extension</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
@@ -34,11 +34,7 @@
<artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-security</artifactId>-->
<!--<optional>true</optional>-->
<!--</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -50,6 +46,7 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.camunda.bpm.extension</groupId>
<artifactId>camunda-bpm-spring-boot-starter-root</artifactId>
<artifactId>camunda-bpm-spring-boot-starter-extension-root</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
View
@@ -0,0 +1,257 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.camunda.bpm.extension</groupId>
<artifactId>camunda-bpm-spring-boot-starter-root</artifactId>
<version>1.1.0-SNAPSHOT</version>
<!-- DO NOT REMOVE EMPTY TAG https://issues.apache.org/jira/browse/MNG-4687 -->
<relativePath />
</parent>
<artifactId>camunda-bpm-spring-boot-starter-extension-root</artifactId>
<packaging>pom</packaging>
<modules>
<module>camunda-spring-boot-starter</module>
<module>camunda-spring-boot-starter-rest</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from camunda -->
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-bom</artifactId>
<version>${camunda.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.camunda.bpm.extension</groupId>
<artifactId>camunda-bpm-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<!-- this is only for jdk 1.6. you can remove this when using java version
later than 1.6 -->
<profile>
<id>java6</id>
<activation>
<jdk>1.6</jdk>
</activation>
<properties>
<!-- camunda and spring use different properties ... -->
<java.version>${version.java}</java.version>
<!-- because of java 1.6 compatibility -->
<tomcat.version>7.0.59</tomcat.version>
<jersey.version>2.6</jersey.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from camunda -->
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-bom</artifactId>
<version>${camunda.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring3</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<!-- use this profile if you want to specify a specific jdk for compilation
and tests -->
<profile>
<id>specific jdk location</id>
<activation>
<property>
<name>jdk_home</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<fork>true</fork>
<executable>${jdk_home}/bin/javac</executable>
<compilerVersion>${version.java}</compilerVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<jvm>${jdk_home}/bin/java</jvm>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:camunda/camunda-bpm-spring-boot-starter.git</connection>
<url>scm:git:git@github.com:camunda/camunda-bpm-spring-boot-starter.git</url>
<developerConnection>scm:git:git@github.com:camunda/camunda-bpm-spring-boot-starter.git</developerConnection>
<tag>HEAD</tag>
</scm>
<!-- repositories used for distribution of releases and snapshots, DO NOT
CHANGE -->
<distributionManagement>
<repository>
<id>camunda-nexus</id>
<name>camunda bpm community extensions</name>
<url>https://app.camunda.com/nexus/content/repositories/camunda-bpm-community-extensions</url>
</repository>
<snapshotRepository>
<id>camunda-nexus</id>
<name>camunda bpm community extensions snapshots</name>
<url>https://app.camunda.com/nexus/content/repositories/camunda-bpm-community-extensions-snapshots</url>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<id>camunda.com.public</id>
<name>Camunda Repository</name>
<url>https://app.camunda.com/nexus/content/groups/public</url>
</repository>
</repositories>
</project>
View
@@ -16,12 +16,9 @@
<packaging>pom</packaging>
<modules>
<module>camunda-spring-boot-starter</module>
<module>extension</module>
<module>examples</module>
<module>camunda-spring-boot-starter-docs</module>
<!--<module>camunda-spring-boot-embedded-webapp</module>-->
<module>camunda-spring-boot-starter-rest</module>
<!--<module>camunda-spring-boot-crash-commands</module>-->
<module>docs</module>
</modules>
<properties>
View
@@ -5,5 +5,5 @@ GH_PAGES_DIR=github-pages
rm -rf $GH_PAGES_DIR
git clone git@github.com:camunda/camunda-bpm-spring-boot-starter.git $GH_PAGES_DIR
(cd $GH_PAGES_DIR && git checkout gh-pages)
cp -r camunda-spring-boot-starter-docs/target/generated-docs/* $GH_PAGES_DIR
cp -r docs/target/generated-docs/* $GH_PAGES_DIR
(cd $GH_PAGES_DIR && git add . && git commit -m "Push docs for commit $GIT_COMMIT" && git push)

0 comments on commit e9e630f

Please sign in to comment.