Skip to content

[JBIDE-13652] removed typed cartridge types #16

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
merged 1 commit into from
Feb 25, 2013
Merged

[JBIDE-13652] removed typed cartridge types #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 0 additions & 33 deletions src/main/java/com/openshift/client/JBossCartridge.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/com/openshift/client/JenkinsCartridge.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/com/openshift/client/NodeJSCartridge.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/com/openshift/client/RubyCartridge.java
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/main/java/com/openshift/internal/client/Cartridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
package com.openshift.internal.client;

import com.openshift.client.ICartridge;
import com.openshift.client.JBossCartridge;
import com.openshift.client.OpenShiftException;
import com.openshift.internal.client.utils.Assert;


/**
Expand All @@ -24,16 +21,6 @@
*/
public class Cartridge implements ICartridge {

protected static final String JBOSS = "jboss";
protected static final String RUBY = "ruby";
protected static final String PYTHON = "python";
protected static final String PHP = "php";
protected static final String PERL = "perl";
protected static final String NODEJS = "nodejs";
protected static final String JENKINS = "jenkins";
protected static final String HAPROXY = "haproxy";
protected static final String RAW = "diy";

private final String name;

public Cartridge(String name) {
Expand All @@ -48,14 +35,6 @@ public String getLogLocation() {
return "/";
}

public static ICartridge valueOf(String name) {
Assert.notNull(name);

if (name.contains(JBOSS))
return new JBossCartridge(name);
else return new Cartridge(name);
}

public int hashCode() {
final int prime = 31;
int result = 1;
Expand All @@ -82,19 +61,4 @@ public boolean equals(Object obj) {
public String toString() {
return "Cartridge [name=" + name + "]";
}

protected String getCartridgeName(String cartridgeType) throws OpenShiftException {
throw new UnsupportedOperationException();
// List<ICartridge> cartridges = service.getCartridges(user);
//
// Iterator<ICartridge> i = cartridges.iterator();
// while (i.hasNext()){
// ICartridge cartridge = i.next();
// if (cartridge.getName().contains(cartridgeType))
// return cartridge.getName();
// }
//
// throw new OpenShiftException("No cartridge found for type " + cartridgeType);
}

}