Repository: brooklyn-library Updated Branches: refs/heads/0.5.0 [created] 0e094fa8b
Convert JavaWebAppService to java, from groovy Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/09491e01 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/09491e01 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/09491e01 Branch: refs/heads/0.5.0 Commit: 09491e01628359663dbf1c09051e0a03dcf3b4dd Parents: 0a14db8 Author: Aled Sage <[email protected]> Authored: Tue Mar 26 17:22:02 2013 +0000 Committer: Aled Sage <[email protected]> Committed: Wed Mar 27 07:36:23 2013 +0000 ---------------------------------------------------------------------- .../MovableElasticWebAppCluster.java | 3 ++- .../entity/webapp/JavaWebAppService.groovy | 19 ---------------- .../entity/webapp/JavaWebAppService.java | 24 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09491e01/examples/portable-cloudfoundry/src/main/java/brooklyn/example/cloudfoundry/MovableElasticWebAppCluster.java ---------------------------------------------------------------------- diff --git a/examples/portable-cloudfoundry/src/main/java/brooklyn/example/cloudfoundry/MovableElasticWebAppCluster.java b/examples/portable-cloudfoundry/src/main/java/brooklyn/example/cloudfoundry/MovableElasticWebAppCluster.java index fc2f76b..95d74fa 100644 --- a/examples/portable-cloudfoundry/src/main/java/brooklyn/example/cloudfoundry/MovableElasticWebAppCluster.java +++ b/examples/portable-cloudfoundry/src/main/java/brooklyn/example/cloudfoundry/MovableElasticWebAppCluster.java @@ -2,6 +2,7 @@ package brooklyn.example.cloudfoundry; import java.util.Collection; +import brooklyn.config.ConfigKey; import brooklyn.entity.Effector; import brooklyn.entity.Entity; import brooklyn.entity.basic.Description; @@ -21,7 +22,7 @@ public interface MovableElasticWebAppCluster extends Entity, Startable, MovableE // either by passing (war: "classpath://...") in the constructor or by setConfig(ROOT_WAR). // as a config variable, it will be inherited by children, so the children web app entities will pick it up. @SetFromFlag("war") - public static final BasicConfigKey<String> ROOT_WAR = JavaWebAppService.ROOT_WAR; + public static final ConfigKey<String> ROOT_WAR = JavaWebAppService.ROOT_WAR; @SetFromFlag("ttl") public static final BasicConfigKey<Long> TIME_TO_LIVE_SECONDS = new BasicConfigKey<Long>( http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09491e01/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.groovy ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.groovy b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.groovy deleted file mode 100644 index 255e56c..0000000 --- a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.groovy +++ /dev/null @@ -1,19 +0,0 @@ -package brooklyn.entity.webapp - -import brooklyn.entity.java.UsesJava -import brooklyn.event.basic.BasicConfigKey -import brooklyn.util.flags.SetFromFlag - -interface JavaWebAppService extends WebAppService, UsesJava { - - @SetFromFlag("war") - public static final BasicConfigKey<String> ROOT_WAR = [ String, "wars.root", "WAR file to deploy as the ROOT, as URL (supporting file: and classpath: prefixes)" ] - - @SetFromFlag("wars") - public static final BasicConfigKey<List<String>> NAMED_WARS = [ List, "wars.named", - "Archive files to deploy, as URL strings (supporting file: and classpath: prefixes); context (path in user-facing URL) will be inferred by name" ] - - @SetFromFlag("warsByContext") - public static final BasicConfigKey<Map<String,String>> WARS_BY_CONTEXT = [ Map, "wars.by.context", - "Map of context keys (path in user-facing URL, typically without slashes) to archives (e.g. WARs by URL) to deploy, supporting file: and classpath: prefixes)" ] -} http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09491e01/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.java b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.java new file mode 100644 index 0000000..383c8d8 --- /dev/null +++ b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppService.java @@ -0,0 +1,24 @@ +package brooklyn.entity.webapp; + +import java.util.List; +import java.util.Map; + +import brooklyn.config.ConfigKey; +import brooklyn.entity.java.UsesJava; +import brooklyn.event.basic.BasicConfigKey; +import brooklyn.util.flags.SetFromFlag; + +public interface JavaWebAppService extends WebAppService, UsesJava { + + @SetFromFlag("war") + public static final ConfigKey<String> ROOT_WAR = new BasicConfigKey<String>( + String.class, "wars.root", "WAR file to deploy as the ROOT, as URL (supporting file: and classpath: prefixes)"); + + @SetFromFlag("wars") + public static final ConfigKey<List<String>> NAMED_WARS = new BasicConfigKey( + List.class, "wars.named", "Archive files to deploy, as URL strings (supporting file: and classpath: prefixes); context (path in user-facing URL) will be inferred by name"); + + @SetFromFlag("warsByContext") + public static final ConfigKey<Map<String,String>> WARS_BY_CONTEXT = new BasicConfigKey( + Map.class, "wars.by.context", "Map of context keys (path in user-facing URL, typically without slashes) to archives (e.g. WARs by URL) to deploy, supporting file: and classpath: prefixes)"); +}
