diff --git a/.gitignore b/.gitignore index 3a98518..4560b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,35 +4,39 @@ docs/workspace.json .gradle/* build/* +structurizr-onpremises/build/* +structurizr-onpremises-plugin/build/* .idea/* +**/structurizr.log -src/main/webapp/static/js/* -src/main/webapp/static/bootstrap-icons/* -src/main/webapp/static/css/* -src/main/webapp/static/html/* -src/main/webapp/static/img/* +structurizr-onpremises/src/main/webapp/static/js/* +structurizr-onpremises/src/main/webapp/static/bootstrap-icons/* +structurizr-onpremises/src/main/webapp/static/css/* +structurizr-onpremises/src/main/webapp/static/html/* +structurizr-onpremises/src/main/webapp/static/img/* -src/main/webapp/WEB-INF/fragments/graphviz.jspf -src/main/webapp/WEB-INF/fragments/progress-message.jspf -src/main/webapp/WEB-INF/fragments/quick-navigation.jspf -src/main/webapp/WEB-INF/fragments/tooltip.jspf -src/main/webapp/WEB-INF/fragments/diagrams/* -!src/main/webapp/WEB-INF/fragments/diagrams/publish.jspf -src/main/webapp/WEB-INF/fragments/decisions/* -src/main/webapp/WEB-INF/fragments/dsl/* -src/main/webapp/WEB-INF/fragments/workspace/load-via-inline.jspf -src/main/webapp/WEB-INF/fragments/workspace/load-via-api.jspf -src/main/webapp/WEB-INF/fragments/workspace/javascript.jspf -src/main/webapp/WEB-INF/fragments/workspace/client-side-encryption-passphrase-modal.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/graphviz.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/progress-message.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/quick-navigation.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/tooltip.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/diagrams/* +!structurizr-onpremises/src/main/webapp/WEB-INF/fragments/diagrams/publish.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/decisions/* +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/dsl/* +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/load-via-inline.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/load-via-api.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/javascript.jspf +structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/client-side-encryption-passphrase-modal.jspf -src/main/webapp/WEB-INF/views/404.jsp -src/main/webapp/WEB-INF/views/500.jsp -src/main/webapp/WEB-INF/views/error.jsp -src/main/webapp/WEB-INF/views/diagrams.jsp -src/main/webapp/WEB-INF/views/decisions.jsp -src/main/webapp/WEB-INF/views/documentation.jsp -src/main/webapp/WEB-INF/views/explore.jsp -src/main/webapp/WEB-INF/views/graph.jsp -src/main/webapp/WEB-INF/views/tree.jsp -src/main/webapp/WEB-INF/views/review-create.jsp -src/main/webapp/WEB-INF/views/review.jsp \ No newline at end of file +structurizr-onpremises/src/main/webapp/WEB-INF/views/404.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/500.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/error.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/diagrams.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/decisions.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/dependencies.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/documentation.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/explore.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/graph.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/tree.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/review-create.jsp +structurizr-onpremises/src/main/webapp/WEB-INF/views/review.jsp \ No newline at end of file diff --git a/README.md b/README.md index 70d24e9..71feec0 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,11 @@ The integration tests use Testcontainers to start an Elasticsearch instance. If `./gradlew clean build -x integrationTest` to exclude the integration tests. -If successful, you will see a file named `structurizr-onpremises.war` in `build/libs`. +If successful, you will see a file named `structurizr-onpremises.war` in `structurizr-onpremises/build/libs`. To then build a Docker image: ``` +cd structurizr-onpremises docker build . -t mytag ``` diff --git a/lib/structurizr-onpremises-plugins.jar b/lib/structurizr-onpremises-plugins.jar deleted file mode 100644 index 05b670b..0000000 Binary files a/lib/structurizr-onpremises-plugins.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 39884a4..83ef046 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ -rootProject.name = 'structurizr-onpremises' \ No newline at end of file +include 'structurizr-onpremises' +include 'structurizr-onpremises-plugin' \ No newline at end of file diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEvent.java b/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEvent.java deleted file mode 100644 index 82c7092..0000000 --- a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEvent.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.structurizr.onpremises.component.workspace; - -public final class WorkspaceEvent { - - private final long workspaceId; - private final WorkspaceProperties workspaceProperties; - private String json; - - WorkspaceEvent(WorkspaceMetaData workspaceMetaData, String json) { - this.workspaceId = workspaceMetaData.getId(); - this.workspaceProperties = new WorkspaceProperties(workspaceMetaData); - this.json = json; - } - - public long getWorkspaceId() { - return workspaceId; - } - - public WorkspaceProperties getWorkspaceProperties() { - return workspaceProperties; - } - - public String getJson() { - return json; - } - - public void setJson(String json) { - this.json = json; - } - -} \ No newline at end of file diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceProperties.java b/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceProperties.java deleted file mode 100644 index 5be8a55..0000000 --- a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceProperties.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.structurizr.onpremises.component.workspace; - -import com.structurizr.configuration.Role; -import com.structurizr.configuration.User; -import com.structurizr.configuration.Visibility; - -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.Set; - -public final class WorkspaceProperties { - - private final long id; - private final String name; - private final String description; - private final Visibility visibility; - - private final Set users; - - private final Date lastModifiedDate; - - public WorkspaceProperties(WorkspaceMetaData workspaceMetaData) { - this.id = workspaceMetaData.getId(); - this.name = workspaceMetaData.getName(); - this.description = workspaceMetaData.getDescription(); - - this.users = new LinkedHashSet<>(); - for (String user : workspaceMetaData.getReadUsers()) { - users.add(new User(user, Role.ReadOnly)); - } - for (String user : workspaceMetaData.getWriteUsers()) { - users.add(new User(user, Role.ReadWrite)); - } - - if (workspaceMetaData.isPublicWorkspace()) { - this.visibility = Visibility.Public; - } else { - this.visibility = Visibility.Private; - } - - this.lastModifiedDate = workspaceMetaData.getLastModifiedDate(); - } - - public long getId() { - return id; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; - } - - public Date getLastModifiedDate() { - return lastModifiedDate; - } - - public Visibility getVisibility() { - return visibility; - } - - public Set getUsers() { - return new LinkedHashSet<>(users); - } - -} \ No newline at end of file diff --git a/structurizr-onpremises-plugin/build.gradle b/structurizr-onpremises-plugin/build.gradle new file mode 100644 index 0000000..9827d4a --- /dev/null +++ b/structurizr-onpremises-plugin/build.gradle @@ -0,0 +1,93 @@ +apply plugin: 'java-library' +apply plugin: 'maven-publish' +apply plugin: 'signing' + +defaultTasks 'clean', 'compileJava', 'test' + +repositories { + mavenCentral() +} + +dependencies { + api 'com.structurizr:structurizr-client:1.26.1' + + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2' +} + +compileJava.options.encoding = 'UTF-8' +compileTestJava.options.encoding = 'UTF-8' + +sourceCompatibility = 11 +targetCompatibility = 11 + +description = 'Plugin APIs for the Structurizr on-premises installation' +group = 'com.structurizr' +version = '0.0.1' + +test { + useJUnitPlatform() +} + +java { + withJavadocJar() + withSourcesJar() +} + +jar { + manifest { + attributes( + 'Implementation-Title': description, + 'Implementation-Version': version + ) + } +} + +publishing { + repositories { + maven { + name = "ossrh" + url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + credentials { + username = findProperty('ossrhUsername') + password = findProperty('ossrhPassword') + } + } + } + + publications { + mavenJava(MavenPublication) { + from components.java + + pom { + name = 'structurizr-onpremises-plugins' + description = 'Plugin APIs for the Structurizr on-premises installation' + url = 'https://github.com/structurizr/onpremises' + + scm { + connection = 'scm:git:git://github.com/structurizr/onpremises.git' + developerConnection = 'scm:git:git@github.com:structurizr/onpremises.git' + url = 'https://github.com/structurizr/onpremises' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = "simon" + name = "Simon Brown" + email = "help@structurizr.com" + } + } + } + } + } +} + +signing { + sign publishing.publications.mavenJava +} \ No newline at end of file diff --git a/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEvent.java b/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEvent.java new file mode 100644 index 0000000..e8d22cd --- /dev/null +++ b/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEvent.java @@ -0,0 +1,11 @@ +package com.structurizr.onpremises.component.workspace; + +public interface WorkspaceEvent { + + WorkspaceProperties getWorkspaceProperties(); + + String getJson(); + + void setJson(String json); + +} \ No newline at end of file diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEventListener.java b/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEventListener.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEventListener.java rename to structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceEventListener.java diff --git a/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceProperties.java b/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceProperties.java new file mode 100644 index 0000000..3b3f126 --- /dev/null +++ b/structurizr-onpremises-plugin/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceProperties.java @@ -0,0 +1,23 @@ +package com.structurizr.onpremises.component.workspace; + +import com.structurizr.configuration.User; +import com.structurizr.configuration.Visibility; + +import java.util.Date; +import java.util.Set; + +public interface WorkspaceProperties { + + long getId(); + + String getName(); + + String getDescription(); + + Date getLastModifiedDate(); + + Visibility getVisibility(); + + Set getUsers(); + +} \ No newline at end of file diff --git a/Dockerfile b/structurizr-onpremises/Dockerfile similarity index 100% rename from Dockerfile rename to structurizr-onpremises/Dockerfile diff --git a/structurizr-onpremises/build.gradle b/structurizr-onpremises/build.gradle new file mode 100644 index 0000000..0a56f2e --- /dev/null +++ b/structurizr-onpremises/build.gradle @@ -0,0 +1,104 @@ +plugins { + id 'war' +} + +group = 'com.structurizr' + +sourceCompatibility = '17' +targetCompatibility = '17' + +repositories { + mavenCentral() +} + +testing { + suites { + test { + useJUnitJupiter() + } + + integrationTest(JvmTestSuite) { + dependencies { + implementation project() + } + + targets { + all { + testTask.configure { + shouldRunAfter(test) + } + } + } + } + } +} + +tasks.named('check') { + dependsOn(testing.suites.integrationTest) +} + +dependencies { + + implementation project(':structurizr-onpremises-plugin') + + implementation 'com.structurizr:structurizr-dsl:1.32.0' + implementation 'com.structurizr:structurizr-graphviz:2.2.1' + + implementation 'javax.servlet:javax.servlet-api:3.0.1' + implementation 'taglibs:standard:1.1.2' + implementation 'jstl:jstl:1.2' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + + implementation 'org.springframework:spring-webmvc:5.3.23' + implementation 'org.springframework.security:spring-security-web:5.6.2' + implementation 'org.springframework.security:spring-security-config:5.6.2' + implementation 'org.springframework.security:spring-security-ldap:5.6.2' + implementation 'org.springframework.security.extensions:spring-security-saml2-core:1.0.3.RELEASE' + implementation 'org.springframework.session:spring-session-data-redis:1.3.3.RELEASE' + + implementation 'org.apache.lucene:lucene-core:9.7.0' + implementation 'org.apache.lucene:lucene-queryparser:9.7.0' + + implementation 'org.apache.logging.log4j:log4j-api:2.17.1' + implementation 'org.apache.logging.log4j:log4j-core:2.17.1' + implementation 'org.apache.logging.log4j:log4j-jcl:2.17.1' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1' + + implementation 'org.elasticsearch.client:elasticsearch-rest-client:7.9.0' + implementation 'org.apache.httpcomponents.client5:httpclient5:5.1.3' + implementation 'org.apache.httpcomponents:httpasyncclient:4.1.4' + + implementation 'com.amazonaws:aws-java-sdk-s3:1.12.134' + implementation 'com.amazonaws:aws-java-sdk-sts:1.12.134' + + testImplementation 'org.testcontainers:elasticsearch:1.18.3' +} + +war { + duplicatesStrategy 'exclude' + + webInf { + from('src/main/java') { + include '*.xml' + into('classes') + } + } +} + +sourceSets.main.resources { + srcDirs = ['src/main/java','src/main/resources'] + include '**/*.xml' + include 'log4j2.properties' + include 'samlKeystore.jks' + include 'build.properties' +} + +task explodedWar(type: Sync) { + into "${buildDir}/exploded" + with war +} + +configurations { + integrationTestImplementation.extendsFrom testImplementation + integrationTestRuntimeOnly.extendsFrom testRuntimeOnly +} \ No newline at end of file diff --git a/src/integrationTest/java/com/structurizr/onpremises/component/search/AbstractSearchComponentTests.java b/structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/search/AbstractSearchComponentTests.java similarity index 100% rename from src/integrationTest/java/com/structurizr/onpremises/component/search/AbstractSearchComponentTests.java rename to structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/search/AbstractSearchComponentTests.java diff --git a/src/integrationTest/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentTests.java b/structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentTests.java similarity index 100% rename from src/integrationTest/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentTests.java rename to structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentTests.java diff --git a/src/integrationTest/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImplTests.java b/structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImplTests.java similarity index 100% rename from src/integrationTest/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImplTests.java rename to structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImplTests.java diff --git a/src/integrationTest/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDaoTests.java b/structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDaoTests.java similarity index 100% rename from src/integrationTest/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDaoTests.java rename to structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDaoTests.java diff --git a/src/integrationTest/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentTests.java b/structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentTests.java similarity index 100% rename from src/integrationTest/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentTests.java rename to structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentTests.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/AmazonWebServicesS3ReviewDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/AmazonWebServicesS3ReviewDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/AmazonWebServicesS3ReviewDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/AmazonWebServicesS3ReviewDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/FileSystemReviewDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/FileSystemReviewDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/FileSystemReviewDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/FileSystemReviewDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/FileTypeAndContent.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/FileTypeAndContent.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/FileTypeAndContent.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/FileTypeAndContent.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/ReviewComponent.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewComponent.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/ReviewComponent.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewComponent.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/ReviewComponentException.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewComponentException.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/ReviewComponentException.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewComponentException.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/ReviewComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewComponentImpl.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/ReviewComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewComponentImpl.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/ReviewDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/ReviewDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/ReviewException.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewException.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/ReviewException.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/ReviewException.java diff --git a/src/main/java/com/structurizr/onpremises/component/review/component.xml b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/component.xml similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/review/component.xml rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/review/component.xml diff --git a/src/main/java/com/structurizr/onpremises/component/search/AbstractSearchComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/AbstractSearchComponentImpl.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/AbstractSearchComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/AbstractSearchComponentImpl.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentImpl.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/ApacheLuceneSearchComponentImpl.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/Document.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/Document.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/Document.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/Document.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/DocumentType.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/DocumentType.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/DocumentType.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/DocumentType.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImpl.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/ElasticSearchComponentImpl.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/NoOpSearchComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/NoOpSearchComponentImpl.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/NoOpSearchComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/NoOpSearchComponentImpl.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/SearchComponent.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchComponent.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/SearchComponent.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchComponent.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/SearchComponentException.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchComponentException.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/SearchComponentException.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchComponentException.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/SearchComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchComponentImpl.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/SearchComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchComponentImpl.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/SearchResponse.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchResponse.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/SearchResponse.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchResponse.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/SearchResult.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchResult.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/SearchResult.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/SearchResult.java diff --git a/src/main/java/com/structurizr/onpremises/component/search/component.xml b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/component.xml similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/search/component.xml rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/search/component.xml diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/AbstractWorkspaceDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/AbstractWorkspaceDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/AbstractWorkspaceDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/AbstractWorkspaceDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/AmazonWebServicesS3WorkspaceDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/AmazonWebServicesS3WorkspaceDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/AmazonWebServicesS3WorkspaceDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/AmazonWebServicesS3WorkspaceDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/FileSystemWorkspaceDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponent.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponent.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponent.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponent.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentException.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentException.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentException.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentException.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImpl.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImpl.java similarity index 90% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImpl.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImpl.java index 1fc2be8..f1139fe 100644 --- a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImpl.java +++ b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImpl.java @@ -25,10 +25,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.UUID; +import java.util.*; public class WorkspaceComponentImpl implements WorkspaceComponent { @@ -181,7 +178,7 @@ public void putWorkspace(long workspaceId, String json) throws WorkspaceComponen } if (Configuration.getInstance().getWorkspaceEventListener() != null) { - WorkspaceEvent event = new WorkspaceEvent(workspaceMetaData, json); + WorkspaceEvent event = createWorkspaceEvent(workspaceMetaData, json); Configuration.getInstance().getWorkspaceEventListener().beforeSave(event); json = event.getJson(); } @@ -314,6 +311,55 @@ public void putWorkspace(long workspaceId, String json) throws WorkspaceComponen } } + private WorkspaceEvent createWorkspaceEvent(WorkspaceMetaData workspaceMetaData, String workspaceAsJson) { + return new WorkspaceEvent() { + + private String json = workspaceAsJson; + + @Override + public WorkspaceProperties getWorkspaceProperties() { + return workspaceMetaData.toWorkspaceProperties(); + } + + @Override + public String getJson() { + return json; + } + + @Override + public void setJson(String json) { + this.json = json; + } + }; +// +// public WorkspaceProperties(WorkspaceMetaData workspaceMetaData) { +// this.id = workspaceMetaData.getId(); +// this.name = workspaceMetaData.getName(); +// this.description = workspaceMetaData.getDescription(); +// +// this.users = new LinkedHashSet<>(); +// for (String user : workspaceMetaData.getReadUsers()) { +// users.add(new com.structurizr.configuration.User(user, Role.ReadOnly)); +// } +// for (String user : workspaceMetaData.getWriteUsers()) { +// users.add(new com.structurizr.configuration.User(user, Role.ReadWrite)); +// } +// +// if (workspaceMetaData.isPublicWorkspace()) { +// this.visibility = Visibility.Public; +// } else { +// this.visibility = Visibility.Private; +// } +// +// this.lastModifiedDate = workspaceMetaData.getLastModifiedDate(); +// } +// +// this.workspaceId = workspaceMetaData.getId(); +// this.workspaceProperties = new WorkspaceProperties(workspaceMetaData); +// this.json = json; + + } + @Override public List getWorkspaceVersions(long workspaceId, int maxVersions) throws WorkspaceComponentException { return workspaceDao.getWorkspaceVersions(workspaceId, maxVersions); diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceDao.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceDao.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceDao.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceDao.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceLockResponse.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceLockResponse.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceLockResponse.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceLockResponse.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaData.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaData.java similarity index 89% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaData.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaData.java index 033a5b9..266f9b7 100644 --- a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaData.java +++ b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaData.java @@ -1,5 +1,7 @@ package com.structurizr.onpremises.component.workspace; +import com.structurizr.configuration.Role; +import com.structurizr.configuration.Visibility; import com.structurizr.onpremises.domain.User; import com.structurizr.onpremises.domain.UserType; import com.structurizr.onpremises.util.DateUtils; @@ -469,4 +471,50 @@ private String toCommaSeparatedString(Set strings) { } } + public WorkspaceProperties toWorkspaceProperties() { + return new WorkspaceProperties() { + @Override + public long getId() { + return WorkspaceMetaData.this.getId(); + } + + @Override + public String getName() { + return WorkspaceMetaData.this.getName(); + } + + @Override + public String getDescription() { + return WorkspaceMetaData.this.getDescription(); + } + + @Override + public Date getLastModifiedDate() { + return WorkspaceMetaData.this.getLastModifiedDate(); + } + + @Override + public Visibility getVisibility() { + if (WorkspaceMetaData.this.isPublicWorkspace()) { + return Visibility.Public; + } else { + return Visibility.Private; + } + } + + @Override + public Set getUsers() { + Set users = new LinkedHashSet<>(); + for (String user : WorkspaceMetaData.this.getReadUsers()) { + users.add(new com.structurizr.configuration.User(user, Role.ReadOnly)); + } + for (String user : WorkspaceMetaData.this.getWriteUsers()) { + users.add(new com.structurizr.configuration.User(user, Role.ReadWrite)); + } + + return users; + } + }; + } + } \ No newline at end of file diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceVersion.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceVersion.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceVersion.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/WorkspaceVersion.java diff --git a/src/main/java/com/structurizr/onpremises/component/workspace/component.xml b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/component.xml similarity index 100% rename from src/main/java/com/structurizr/onpremises/component/workspace/component.xml rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/component/workspace/component.xml diff --git a/src/main/java/com/structurizr/onpremises/domain/AuthenticationMethod.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/AuthenticationMethod.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/AuthenticationMethod.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/AuthenticationMethod.java diff --git a/src/main/java/com/structurizr/onpremises/domain/Image.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Image.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/Image.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Image.java diff --git a/src/main/java/com/structurizr/onpremises/domain/InputStreamAndContentLength.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/InputStreamAndContentLength.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/InputStreamAndContentLength.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/InputStreamAndContentLength.java diff --git a/src/main/java/com/structurizr/onpremises/domain/Message.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Message.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/Message.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Message.java diff --git a/src/main/java/com/structurizr/onpremises/domain/MessageType.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/MessageType.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/MessageType.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/MessageType.java diff --git a/src/main/java/com/structurizr/onpremises/domain/Messages.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Messages.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/Messages.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Messages.java diff --git a/src/main/java/com/structurizr/onpremises/domain/Role.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Role.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/Role.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/Role.java diff --git a/src/main/java/com/structurizr/onpremises/domain/User.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/User.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/User.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/User.java diff --git a/src/main/java/com/structurizr/onpremises/domain/UserType.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/UserType.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/UserType.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/UserType.java diff --git a/src/main/java/com/structurizr/onpremises/domain/review/Comment.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Comment.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/review/Comment.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Comment.java diff --git a/src/main/java/com/structurizr/onpremises/domain/review/CommentType.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/CommentType.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/review/CommentType.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/CommentType.java diff --git a/src/main/java/com/structurizr/onpremises/domain/review/Diagram.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Diagram.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/review/Diagram.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Diagram.java diff --git a/src/main/java/com/structurizr/onpremises/domain/review/Review.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Review.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/review/Review.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Review.java diff --git a/src/main/java/com/structurizr/onpremises/domain/review/ReviewType.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/ReviewType.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/review/ReviewType.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/ReviewType.java diff --git a/src/main/java/com/structurizr/onpremises/domain/review/Session.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Session.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/domain/review/Session.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/domain/review/Session.java diff --git a/src/main/java/com/structurizr/onpremises/util/ConfigLookup.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/ConfigLookup.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/ConfigLookup.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/ConfigLookup.java diff --git a/src/main/java/com/structurizr/onpremises/util/Configuration.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/Configuration.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/Configuration.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/Configuration.java diff --git a/src/main/java/com/structurizr/onpremises/util/DateUtils.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/DateUtils.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/DateUtils.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/DateUtils.java diff --git a/src/main/java/com/structurizr/onpremises/util/Features.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/Features.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/Features.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/Features.java diff --git a/src/main/java/com/structurizr/onpremises/util/HtmlUtils.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/HtmlUtils.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/HtmlUtils.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/HtmlUtils.java diff --git a/src/main/java/com/structurizr/onpremises/util/JsonUtils.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/JsonUtils.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/JsonUtils.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/JsonUtils.java diff --git a/src/main/java/com/structurizr/onpremises/util/PropertyPlaceholderConfigurer.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/PropertyPlaceholderConfigurer.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/PropertyPlaceholderConfigurer.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/PropertyPlaceholderConfigurer.java diff --git a/src/main/java/com/structurizr/onpremises/util/RandomGuidGenerator.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/RandomGuidGenerator.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/RandomGuidGenerator.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/RandomGuidGenerator.java diff --git a/src/main/java/com/structurizr/onpremises/util/StructurizrProperties.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/StructurizrProperties.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/StructurizrProperties.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/StructurizrProperties.java diff --git a/src/main/java/com/structurizr/onpremises/util/Version.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/Version.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/util/Version.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/util/Version.java diff --git a/src/main/java/com/structurizr/onpremises/web/AbstractController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/AbstractController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/AbstractController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/AbstractController.java diff --git a/src/main/java/com/structurizr/onpremises/web/BuildInformationController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/BuildInformationController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/BuildInformationController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/BuildInformationController.java diff --git a/src/main/java/com/structurizr/onpremises/web/ContextLoaderListener.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/ContextLoaderListener.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/ContextLoaderListener.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/ContextLoaderListener.java diff --git a/src/main/java/com/structurizr/onpremises/web/NoOpSpringSessionRepositoryFilter.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/NoOpSpringSessionRepositoryFilter.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/NoOpSpringSessionRepositoryFilter.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/NoOpSpringSessionRepositoryFilter.java diff --git a/src/main/java/com/structurizr/onpremises/web/RawViewResolver.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/RawViewResolver.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/RawViewResolver.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/RawViewResolver.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/AdminApiController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/AdminApiController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/AdminApiController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/AdminApiController.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/ApiController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/ApiController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/ApiController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/ApiController.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/ApiException.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/ApiException.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/ApiException.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/ApiException.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/ApiResponse.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/ApiResponse.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/ApiResponse.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/ApiResponse.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCode.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCode.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCode.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCode.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeader.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeader.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeader.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeader.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/HmacContent.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HmacContent.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/HmacContent.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HmacContent.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/HttpHeaders.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HttpHeaders.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/HttpHeaders.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HttpHeaders.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/HttpUnauthorizedException.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HttpUnauthorizedException.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/HttpUnauthorizedException.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/HttpUnauthorizedException.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/Md5Digest.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/Md5Digest.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/Md5Digest.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/Md5Digest.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/WorkspaceApiResponse.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/WorkspaceApiResponse.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/WorkspaceApiResponse.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/WorkspaceApiResponse.java diff --git a/src/main/java/com/structurizr/onpremises/web/api/WorkspacesApiResponse.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/WorkspacesApiResponse.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/api/WorkspacesApiResponse.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/api/WorkspacesApiResponse.java diff --git a/src/main/java/com/structurizr/onpremises/web/dashboard/DashboardController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/dashboard/DashboardController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/dashboard/DashboardController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/dashboard/DashboardController.java diff --git a/src/main/java/com/structurizr/onpremises/web/error/Http404Controller.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/error/Http404Controller.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/error/Http404Controller.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/error/Http404Controller.java diff --git a/src/main/java/com/structurizr/onpremises/web/error/Http500Controller.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/error/Http500Controller.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/error/Http500Controller.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/error/Http500Controller.java diff --git a/src/main/java/com/structurizr/onpremises/web/graphviz/GraphvizController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/graphviz/GraphvizController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/graphviz/GraphvizController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/graphviz/GraphvizController.java diff --git a/src/main/java/com/structurizr/onpremises/web/home/HomePageController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/home/HomePageController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/home/HomePageController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/home/HomePageController.java diff --git a/src/main/java/com/structurizr/onpremises/web/review/ReviewController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/review/ReviewController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/review/ReviewController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/review/ReviewController.java diff --git a/src/main/java/com/structurizr/onpremises/web/search/SearchController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/search/SearchController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/search/SearchController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/search/SearchController.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/AuthenticationFailureHandler.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/AuthenticationFailureHandler.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/AuthenticationFailureHandler.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/AuthenticationFailureHandler.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/AuthenticationSuccessHandler.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/AuthenticationSuccessHandler.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/AuthenticationSuccessHandler.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/AuthenticationSuccessHandler.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/BcryptController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/BcryptController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/BcryptController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/BcryptController.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/CsrfSecurityRequestMatcher.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/CsrfSecurityRequestMatcher.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/CsrfSecurityRequestMatcher.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/CsrfSecurityRequestMatcher.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/FileBasedUserDetailsService.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/FileBasedUserDetailsService.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/FileBasedUserDetailsService.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/FileBasedUserDetailsService.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/SecurityUtils.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/SecurityUtils.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/SecurityUtils.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/SecurityUtils.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/SignInController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/SignInController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/SignInController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/SignInController.java diff --git a/src/main/java/com/structurizr/onpremises/web/security/SignoutController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/SignoutController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/security/SignoutController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/security/SignoutController.java diff --git a/src/main/java/com/structurizr/onpremises/web/user/UserProfileController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/user/UserProfileController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/user/UserProfileController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/user/UserProfileController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceEditorController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceEditorController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceEditorController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/AbstractWorkspaceEditorController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DecisionsController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DecisionsController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DecisionsController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DecisionsController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DiagramEditorController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DiagramEditorController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DiagramEditorController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DiagramEditorController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DiagramViewerController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DiagramViewerController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DiagramViewerController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DiagramViewerController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DocumentationController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DocumentationController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DocumentationController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DocumentationController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DslEditorController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DslEditorController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DslEditorController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DslEditorController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/DslEditorResponse.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DslEditorResponse.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/DslEditorResponse.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/DslEditorResponse.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/EmbedController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/EmbedController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/EmbedController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/EmbedController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/ExploreController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ExploreController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/ExploreController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ExploreController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/GraphController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/GraphController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/GraphController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/GraphController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/ImageController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ImageController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/ImageController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ImageController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/ImagesController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ImagesController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/ImagesController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ImagesController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/LockController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/LockController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/LockController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/LockController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/ThemeController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ThemeController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/ThemeController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/ThemeController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/TreeController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/TreeController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/TreeController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/TreeController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/UsersController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/UsersController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/UsersController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/UsersController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsController.java diff --git a/src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryController.java b/structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryController.java similarity index 100% rename from src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryController.java rename to structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryController.java diff --git a/src/main/resources/build.properties b/structurizr-onpremises/src/main/resources/build.properties similarity index 100% rename from src/main/resources/build.properties rename to structurizr-onpremises/src/main/resources/build.properties diff --git a/src/main/resources/log4j2.properties b/structurizr-onpremises/src/main/resources/log4j2.properties similarity index 100% rename from src/main/resources/log4j2.properties rename to structurizr-onpremises/src/main/resources/log4j2.properties diff --git a/src/main/resources/samlKeystore.jks b/structurizr-onpremises/src/main/resources/samlKeystore.jks similarity index 100% rename from src/main/resources/samlKeystore.jks rename to structurizr-onpremises/src/main/resources/samlKeystore.jks diff --git a/src/main/webapp/WEB-INF/applicationContext-security-file.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-file.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-security-file.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-file.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-security-inmemory.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-inmemory.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-security-inmemory.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-inmemory.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-security-ldap.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-ldap.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-security-ldap.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-ldap.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-security-saml.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-saml.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-security-saml.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security-saml.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-security.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-security.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-security.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-session-local.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-session-local.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-session-local.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-session-local.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-session-redis.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-session-redis.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-session-redis.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext-session-redis.xml diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/applicationContext.xml diff --git a/src/main/webapp/WEB-INF/fragments/coda.jspf b/structurizr-onpremises/src/main/webapp/WEB-INF/fragments/coda.jspf similarity index 100% rename from src/main/webapp/WEB-INF/fragments/coda.jspf rename to structurizr-onpremises/src/main/webapp/WEB-INF/fragments/coda.jspf diff --git a/src/main/webapp/WEB-INF/fragments/dashboard-workspaces.jspf b/structurizr-onpremises/src/main/webapp/WEB-INF/fragments/dashboard-workspaces.jspf similarity index 100% rename from src/main/webapp/WEB-INF/fragments/dashboard-workspaces.jspf rename to structurizr-onpremises/src/main/webapp/WEB-INF/fragments/dashboard-workspaces.jspf diff --git a/src/main/webapp/WEB-INF/fragments/diagrams/publish.jspf b/structurizr-onpremises/src/main/webapp/WEB-INF/fragments/diagrams/publish.jspf similarity index 100% rename from src/main/webapp/WEB-INF/fragments/diagrams/publish.jspf rename to structurizr-onpremises/src/main/webapp/WEB-INF/fragments/diagrams/publish.jspf diff --git a/src/main/webapp/WEB-INF/fragments/prelude.jspf b/structurizr-onpremises/src/main/webapp/WEB-INF/fragments/prelude.jspf similarity index 100% rename from src/main/webapp/WEB-INF/fragments/prelude.jspf rename to structurizr-onpremises/src/main/webapp/WEB-INF/fragments/prelude.jspf diff --git a/src/main/webapp/WEB-INF/fragments/workspace/auto-refresh.jspf b/structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/auto-refresh.jspf similarity index 100% rename from src/main/webapp/WEB-INF/fragments/workspace/auto-refresh.jspf rename to structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/auto-refresh.jspf diff --git a/src/main/webapp/WEB-INF/fragments/workspace/auto-save.jspf b/structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/auto-save.jspf similarity index 100% rename from src/main/webapp/WEB-INF/fragments/workspace/auto-save.jspf rename to structurizr-onpremises/src/main/webapp/WEB-INF/fragments/workspace/auto-save.jspf diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/glassfish-web.xml similarity index 100% rename from src/main/webapp/WEB-INF/glassfish-web.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/glassfish-web.xml diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/jboss-web.xml similarity index 100% rename from src/main/webapp/WEB-INF/jboss-web.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/jboss-web.xml diff --git a/src/main/webapp/WEB-INF/raw-views/json.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/raw-views/json.jsp similarity index 100% rename from src/main/webapp/WEB-INF/raw-views/json.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/raw-views/json.jsp diff --git a/src/main/webapp/WEB-INF/root-servlet.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/root-servlet.xml similarity index 100% rename from src/main/webapp/WEB-INF/root-servlet.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/root-servlet.xml diff --git a/src/main/webapp/WEB-INF/views/dashboard.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/dashboard.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/dashboard.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/dashboard.jsp diff --git a/src/main/webapp/WEB-INF/views/dsl-editor-disabled.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/dsl-editor-disabled.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/dsl-editor-disabled.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/dsl-editor-disabled.jsp diff --git a/src/main/webapp/WEB-INF/views/dsl-editor.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/dsl-editor.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/dsl-editor.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/dsl-editor.jsp diff --git a/src/main/webapp/WEB-INF/views/feature-not-available.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/feature-not-available.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/feature-not-available.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/feature-not-available.jsp diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/home.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/home.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/home.jsp diff --git a/src/main/webapp/WEB-INF/views/images.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/images.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/images.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/images.jsp diff --git a/src/main/webapp/WEB-INF/views/search-results.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/search-results.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/search-results.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/search-results.jsp diff --git a/src/main/webapp/WEB-INF/views/signin.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/signin.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/signin.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/signin.jsp diff --git a/src/main/webapp/WEB-INF/views/user-profile.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/user-profile.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/user-profile.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/user-profile.jsp diff --git a/src/main/webapp/WEB-INF/views/users.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/users.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/users.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/users.jsp diff --git a/src/main/webapp/WEB-INF/views/workspace-could-not-be-locked.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-could-not-be-locked.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/workspace-could-not-be-locked.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-could-not-be-locked.jsp diff --git a/src/main/webapp/WEB-INF/views/workspace-is-client-side-encrypted.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-is-client-side-encrypted.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/workspace-is-client-side-encrypted.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-is-client-side-encrypted.jsp diff --git a/src/main/webapp/WEB-INF/views/workspace-is-readonly.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-is-readonly.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/workspace-is-readonly.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-is-readonly.jsp diff --git a/src/main/webapp/WEB-INF/views/workspace-locked.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-locked.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/workspace-locked.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-locked.jsp diff --git a/src/main/webapp/WEB-INF/views/workspace-settings.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-settings.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/workspace-settings.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-settings.jsp diff --git a/src/main/webapp/WEB-INF/views/workspace-summary.jsp b/structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-summary.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/workspace-summary.jsp rename to structurizr-onpremises/src/main/webapp/WEB-INF/views/workspace-summary.jsp diff --git a/src/main/webapp/WEB-INF/web.xml b/structurizr-onpremises/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/main/webapp/WEB-INF/web.xml rename to structurizr-onpremises/src/main/webapp/WEB-INF/web.xml diff --git a/src/main/webapp/favicon.ico b/structurizr-onpremises/src/main/webapp/favicon.ico similarity index 100% rename from src/main/webapp/favicon.ico rename to structurizr-onpremises/src/main/webapp/favicon.ico diff --git a/src/test/java/com/structurizr/onpremises/component/workspace/MockWorkspaceDao.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/MockWorkspaceDao.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/component/workspace/MockWorkspaceDao.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/MockWorkspaceDao.java diff --git a/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java similarity index 99% rename from src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java index 12bba4f..74aff32 100644 --- a/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java +++ b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java @@ -449,7 +449,7 @@ public void putWorkspaceMetaData(WorkspaceMetaData wmd) { Configuration.getInstance().setWorkspaceEventListener(new WorkspaceEventListener() { @Override public void beforeSave(WorkspaceEvent event) { - buf.append("beforeSave:" + event.getWorkspaceId() + ":" + event.getJson()); + buf.append("beforeSave:" + event.getWorkspaceProperties().getId() + ":" + event.getJson()); } }); diff --git a/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaDataTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaDataTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaDataTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceMetaDataTests.java diff --git a/src/test/java/com/structurizr/onpremises/domain/UserTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/domain/UserTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/domain/UserTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/domain/UserTests.java diff --git a/src/test/java/com/structurizr/onpremises/util/HtmlUtilsTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/util/HtmlUtilsTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/util/HtmlUtilsTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/util/HtmlUtilsTests.java diff --git a/src/test/java/com/structurizr/onpremises/util/VersionTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/util/VersionTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/util/VersionTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/util/VersionTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/AbstractControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/AbstractControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/AbstractControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/AbstractControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/ControllerTestsBase.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/ControllerTestsBase.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/ControllerTestsBase.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/ControllerTestsBase.java diff --git a/src/test/java/com/structurizr/onpremises/web/MockHttpServletRequest.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockHttpServletRequest.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/MockHttpServletRequest.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockHttpServletRequest.java diff --git a/src/test/java/com/structurizr/onpremises/web/MockHttpServletResponse.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockHttpServletResponse.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/MockHttpServletResponse.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockHttpServletResponse.java diff --git a/src/test/java/com/structurizr/onpremises/web/MockReviewComponent.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockReviewComponent.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/MockReviewComponent.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockReviewComponent.java diff --git a/src/test/java/com/structurizr/onpremises/web/MockSearchComponent.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockSearchComponent.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/MockSearchComponent.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockSearchComponent.java diff --git a/src/test/java/com/structurizr/onpremises/web/MockWorkspaceComponent.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockWorkspaceComponent.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/MockWorkspaceComponent.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/MockWorkspaceComponent.java diff --git a/src/test/java/com/structurizr/onpremises/web/api/AdminApiControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/AdminApiControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/api/AdminApiControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/AdminApiControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/api/ApiControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/ApiControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/api/ApiControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/ApiControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCodeTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCodeTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCodeTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/HashBasedMessageAuthenticationCodeTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeaderTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeaderTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeaderTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/HmacAuthorizationHeaderTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/api/HmacContentTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/HmacContentTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/api/HmacContentTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/HmacContentTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/api/Md5DigestTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/Md5DigestTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/api/Md5DigestTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/Md5DigestTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/dashboard/DashboardControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/dashboard/DashboardControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/dashboard/DashboardControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/dashboard/DashboardControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/home/HomePageControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/home/HomePageControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/home/HomePageControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/home/HomePageControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/security/SecurityUtilsTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/security/SecurityUtilsTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/security/SecurityUtilsTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/security/SecurityUtilsTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/CreateWorkspaceControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/DecisionsControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DecisionsControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/DecisionsControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DecisionsControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DeleteWorkspaceControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/DiagramEditorControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DiagramEditorControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/DiagramEditorControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DiagramEditorControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/DiagramViewerControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DiagramViewerControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/DiagramViewerControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DiagramViewerControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/DocumentationControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DocumentationControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/DocumentationControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DocumentationControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/DslEditorControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DslEditorControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/DslEditorControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/DslEditorControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/EmbedControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/EmbedControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/EmbedControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/EmbedControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/ExploreControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ExploreControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/ExploreControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ExploreControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/GraphControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/GraphControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/GraphControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/GraphControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/ImageControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ImageControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/ImageControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ImageControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/ImagesControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ImagesControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/ImagesControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ImagesControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/LockControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/LockControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/LockControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/LockControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/PrivateWorkspaceControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/PublicWorkspaceControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/ReviewControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ReviewControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/ReviewControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ReviewControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ShareWorkspaceControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/ThemeControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ThemeControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/ThemeControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/ThemeControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/TreeControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/TreeControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/TreeControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/TreeControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/UnshareWorkspaceControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/UsersControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/UsersControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/UsersControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/UsersControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSettingsControllerTests.java diff --git a/src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryControllerTests.java b/structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryControllerTests.java similarity index 100% rename from src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryControllerTests.java rename to structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/WorkspaceSummaryControllerTests.java diff --git a/ui.sh b/ui.sh index 8364220..ebb8250 100755 --- a/ui.sh +++ b/ui.sh @@ -3,7 +3,7 @@ # - this has only been tested on MacOS export STRUCTURIZR_UI_DIR=../structurizr-ui -export STRUCTURIZR_ONPREMISES_DIR=. +export STRUCTURIZR_ONPREMISES_DIR=./structurizr-onpremises mkdir $STRUCTURIZR_ONPREMISES_DIR/src/main/webapp/static