Skip to content

OCI dependencies removed #19

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.

Sign up for GitHub

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

Merged
peeqle merged 3 commits into from
Sep 15, 2025
Merged

OCI dependencies removed #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec83924
OCI deps removed
peeqle Sep 8, 2025
074c865
Merge branch 'main' into graceful-removal
peeqle Sep 15, 2025
2fedd28
conflicts
peeqle Sep 15, 2025
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
76 changes: 0 additions & 76 deletions emucomp-api/src/main/java/de/bwl/bwfla/emucomp/api/handlers/ContainerResource.java
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions emucomp-api/src/main/java/de/bwl/bwfla/emucomp/api/handlers/rpc/ContainerRPCService.java
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion emucomp-api/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ quarkus:
health:
enabled: true
host: 0.0.0.0
port: 9000
port: 9000
kubernetes-client:
devservices:
enabled: false
14 changes: 0 additions & 14 deletions emucomp-grpc-interface/src/main/proto/ContainerInterface.proto
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions emucomp-impl/src/main/java/de/bwl/bwfla/emucomp/components/api/ContainerComponent.java
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions ...omp-impl/src/main/java/de/bwl/bwfla/emucomp/components/containers/ContainerBeanState.java
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions emucomp-impl/src/main/java/de/bwl/bwfla/emucomp/components/containers/ContainerState.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions emucomp-impl/src/main/java/de/bwl/bwfla/emucomp/components/emulators/EmulatorBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@
import de.bwl.bwfla.emucomp.template.BlobDescription;
import de.bwl.bwfla.emucomp.template.BlobHandle;
import de.bwl.bwfla.emucomp.xpra.IAudioStreamer;
import de.bwl.bwfla.emucomp.xpra.PulseAudioStreamer;
import de.bwl.bwfla.emucomp.xpra.XpraUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.glyptodon.guacamole.GuacamoleException;
Expand Down Expand Up @@ -83,7 +78,6 @@
/**
* @author iv1004
*/
@Slf4j
public abstract class EmulatorBean extends EaasComponentBean implements EmulatorComponent {
private EmulatorBeanMode emuBeanMode;

Expand Down Expand Up @@ -825,12 +819,6 @@ private void startBackend() throws BWFLAException, IOException {
this.addControlConnector(new XpraConnector(this.getXpraSocketPath()));
}

if (this.isPulseAudioEnabled()) {
final String cid = this.getComponentId();
final Path pulsesock = this.getPulseAudioSocketPath();
this.addControlConnector(new AudioConnector(() -> new PulseAudioStreamer(cid, pulsesock)));
}

this.addControlConnector(new StdoutLogConnector(emuRunner.getStdOutPath()));
this.addControlConnector(new StderrLogConnector(emuRunner.getStdErrPath()));

Expand Down
Loading
Loading