Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh 4451 s3 appender #4466

Merged
merged 7 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@ include 'stroom-analytics:stroom-analytics-rule-impl'
include 'stroom-analytics:stroom-analytics-impl-db'
include 'stroom-analytics:stroom-analytics-impl-db-jooq'

// Annotations project.
// Annotations
include 'stroom-annotation:stroom-annotation-api'
include 'stroom-annotation:stroom-annotation-impl'
include 'stroom-annotation:stroom-annotation-impl-db'
include 'stroom-annotation:stroom-annotation-impl-db-jooq'
include 'stroom-annotation:stroom-annotation-pipeline'

// AWS
include 'stroom-aws:stroom-aws-s3-impl'

// App.
include 'stroom-app'
include 'stroom-app-gwt'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import stroom.analytics.client.gin.AnalyticsGinjector;
import stroom.analytics.client.gin.AnalyticsModule;
import stroom.annotation.client.AnnotationModule;
import stroom.aws.s3.client.gin.S3ConfigGinjector;
import stroom.aws.s3.client.gin.S3ConfigModule;
import stroom.cache.client.gin.CacheGinjector;
import stroom.cache.client.gin.CacheModule;
import stroom.content.client.presenter.ContentTabPanePresenter;
Expand Down Expand Up @@ -152,6 +154,7 @@
ViewModule.class,
WelcomeModule.class,
XMLSchemaModule.class,
S3ConfigModule.class,
ScyllaDbModule.class,
StateStoreModule.class,
})
Expand Down Expand Up @@ -192,6 +195,7 @@ public interface AppGinjectorUser extends
VisualisationGinjector,
WelcomeGinjector,
XMLSchemaGinjector,
S3ConfigGinjector,
ScyllaDbGinjector,
StateStoreGinjector {

Expand Down
1 change: 1 addition & 0 deletions stroom-app-gwt/src/main/resources/stroom/app/App.gwt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
<inherits name="stroom.processor.Processor"/>
<inherits name="stroom.xmlschema.XMLSchema" />
<inherits name="stroom.kafka.KafkaConfig" />
<inherits name="stroom.aws.s3.S3Config" />
<inherits name="stroom.pool.Pool" />
<inherits name="stroom.cache.Cache" />
<inherits name="stroom.feed.Feed" />
Expand Down
1 change: 1 addition & 0 deletions stroom-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dependencies {
implementation project(':stroom-annotation:stroom-annotation-impl-db')
implementation project(':stroom-annotation:stroom-annotation-impl-db-jooq')
implementation project(':stroom-annotation:stroom-annotation-pipeline')
implementation project(':stroom-aws:stroom-aws-s3-impl')
implementation project(':stroom-bytebuffer')
implementation project(':stroom-cache:stroom-cache-api')
implementation project(':stroom-cache:stroom-cache-impl')
Expand Down
2 changes: 2 additions & 0 deletions stroom-app/src/main/java/stroom/app/guice/CoreModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ protected void configure() {
install(new stroom.annotation.impl.AnnotationModule());
install(new stroom.annotation.impl.db.AnnotationDaoModule());
install(new stroom.annotation.pipeline.AnnotationPipelineModule());
install(new stroom.aws.s3.impl.S3ConfigHandlerModule());
install(new stroom.aws.s3.impl.S3ConfigModule());
install(new stroom.cache.impl.CacheModule());
install(new stroom.cache.impl.CacheResourceModule());
install(new stroom.cluster.lock.impl.db.ClusterLockModule());
Expand Down
3 changes: 1 addition & 2 deletions stroom-app/src/main/resources/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/gwt-unitCache/
/new-ui/
/gwt-unitCache/
1 change: 1 addition & 0 deletions stroom-app/src/main/resources/ui/images/document/S3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions stroom-app/src/main/resources/ui/images/document/S3v1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions stroom-app/src/main/resources/ui/images/document/S3v2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading