getPossibleObjectsAt(LocalWorld world, int x, int z)
++ {
++ return world.getSettings().biomeConfigs[world.getBiome(x, z).getId()].biomeObjects;
++ }
++
++ @Override
++ public String getName()
++ {
++ return ""UseBiome"";
++ }
++
++ @Override
++ public boolean canSpawnAsTree()
++ {
++ return true;
++ }
++
++ @Override
++ public boolean canSpawnAsObject()
+ {
-+ ProjectStage ps = getProjectStage();
++ return true;
++ }
+
-+ String value = getPropertyValue(key + '.' + ps);
-+ if (value == null)
++ @Override
++ public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
++ {
++ for (CustomObject object : getPossibleObjectsAt(world, x, z))
+ {
-+ value = getPropertyValue(key);
++ if (object.spawn(world, random, x, y, z))
++ {
++ return true;
++ }
+ }
++ return false;
++ }
+
-+ return value;
++ @Override
++ public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
++ {
++ for (CustomObject object : getPossibleObjectsAt(world, x, z))
++ {
++ if (object.spawnAsTree(world, random, x, y, z))
++ {
++ return true;
++ }
++ }
++ return false;
+ }
-+ /**
-+ * {@link #getProjectStageAwarePropertyValue(String)} which returns the defaultValue
-+ * if the property is null or empty.
-+ * @param key
- * @param defaultValue
- * @return the configured value or if non found the defaultValue
- *
- */
- public static String getProjectStageAwarePropertyValue(String key, String defaultValue)
- {
-- ProjectStage ps = getProjectStage();
-+ String value = getProjectStageAwarePropertyValue(key);
+
-+ if (value == null || value.length() == 0)
++ @Override
++ public boolean spawn(LocalWorld world, Random random, int x, int z)
++ {
++ for (CustomObject object : getPossibleObjectsAt(world, x, z))
+ {
-+ value = defaultValue;
++ if (object.spawn(world, random, x, z))
++ {
++ return true;
++ }
+ }
++ return false;
++ }
+
-+ return value;
++ @Override
++ public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
++ {
++ for (CustomObject object : getPossibleObjectsAt(world, x, z))
++ {
++ if (object.spawnAsTree(world, random, x, z))
++ {
++ return true;
++ }
++ }
++ return false;
+ }
+
-+ /**
-+ * Search for the configured value in all {@link ConfigSource}s and take the
-+ * current {@link org.apache.deltaspike.core.api.projectstage.ProjectStage}
-+ * and the value configured for the given property into account.
-+ *
-+ * The first step is to resolve the value of the given property. This will
-+ * take the current ProjectStage into account. E.g. given the property is 'dbvendor'
-+ * and the ProjectStage is 'UnitTest', the first lookup is
-+ *
.
-+ * If this value is not found then we will do a 2nd lookup for
-+ *
-+ *
-+ * If a value was found for the given property (e.g. dbvendor = 'mysql'
-+ * then we will use this value to lookup in the following order until we
-+ * found a non-null value. If there was no value found for the property
-+ * we will only do the key+ProjectStage and key lookup.
-+ * In the following sample 'dataSource' is used as key parameter:
-+ *
-+ *
-+ * - 'datasource.mysql.UnitTest'
-+ * - 'datasource.mysql'
-+ * - 'datasource.UnitTest'
-+ * - 'datasource'
-+ *
-+ *
-+ *
-+ *
-+ * Attention This method must only be used after all ConfigSources
-+ * got registered and it also must not be used to determine the ProjectStage itself.
-+ * @param key
-+ * @param property the property to look up first
-+ * @return the configured value or if non found the defaultValue
-+ *
-+ */
-+ public static String getPropertyAwarePropertyValue(String key, String property)
++ @Override
++ public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ for (CustomObject object : getPossibleObjectsAt(world, chunkX * 16 + 8, chunkZ * 16 + 8))
++ {
++ object.process(world, random, chunkX, chunkZ);
++ }
++ }
++
++ @Override
++ public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ for (CustomObject object : getPossibleObjectsAt(world, chunkX * 16 + 8, chunkZ * 16 + 8))
++ {
++ object.processAsTree(world, random, chunkX, chunkZ);
++ }
++ }
++
++ @Override
++ public CustomObject applySettings(Map settings)
++ {
++ // Not supported
++ return this;
++ }
++
++ @Override
++ public boolean hasPreferenceToSpawnIn(LocalBiome biome)
++ {
++ // Never, ever spawn this with UseWorld.
++ return false;
++ }
++
++}
+diff --git a/common/src/com/khorn/terraincontrol/customobjects/UseWorld.java b/common/src/com/khorn/terraincontrol/customobjects/UseWorld.java
+new file mode 100644
+index 000000000..cfd50f842
+--- /dev/null
++++ b/common/src/com/khorn/terraincontrol/customobjects/UseWorld.java
+@@ -0,0 +1,118 @@
++package com.khorn.terraincontrol.customobjects;
++
++import java.util.Map;
++import java.util.Random;
++
++import com.khorn.terraincontrol.LocalBiome;
++import com.khorn.terraincontrol.LocalWorld;
++
++/**
++ * UseWorld is a keyword that spawns the objects in the WorldObjects folder.
++ *
++ */
++public class UseWorld implements CustomObject
++{
++
++ @Override
++ public String getName()
++ {
++ return ""UseWorld"";
++ }
++
++ @Override
++ public boolean canSpawnAsTree()
+ {
-+ String propertyValue = getProjectStageAwarePropertyValue(property);
++ return true;
++ }
+
-+ String value = null;
++ @Override
++ public boolean canSpawnAsObject()
++ {
++ return true;
++ }
+
-+ if (propertyValue != null && propertyValue.length() > 0)
++ @Override
++ public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
++ {
++ for(CustomObject object: world.getSettings().customObjects.values())
+ {
-+ value = getProjectStageAwarePropertyValue(key + '.' + propertyValue);
++ if(object.hasPreferenceToSpawnIn(world.getBiome(x, z)) && object.spawn(world, random, x, y, z))
++ {
++ return true;
++ }
+ }
-
-- String value = getPropertyValue(key + '.' + ps, defaultValue);
- if (value == null)
- {
-- value = getPropertyValue(key, defaultValue);
-+ value = getProjectStageAwarePropertyValue(key);
++ return false;
++ }
++
++ @Override
++ public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
++ {
++ for(CustomObject object: world.getSettings().customObjects.values())
++ {
++ if(object.spawnAsTree(world, random, x, y, z))
++ {
++ return true;
++ }
+ }
++ return false;
++ }
+
-+ return value;
++ @Override
++ public boolean spawn(LocalWorld world, Random random, int x, int z)
++ {
++ for(CustomObject object: world.getSettings().customObjects.values())
++ {
++ if(object.spawn(world, random, x, z))
++ {
++ return true;
++ }
++ }
++ return false;
+ }
+
-+ /*
-+ * Attention This method must only be used after all ConfigSources
-+ * got registered and it also must not be used to determine the ProjectStage itself.
-+ * @param key
-+ * @param property the property to look up first
-+ * @param defaultValue
-+ * @return the configured value or if non found the defaultValue
-+ *
-+ */
-+ public static String getPropertyAwarePropertyValue(String key, String property, String defaultValue)
++ @Override
++ public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
+ {
-+ String value = getPropertyAwarePropertyValue(key, property);
++ for(CustomObject object: world.getSettings().customObjects.values())
++ {
++ if(object.spawnAsTree(world, random, x, z))
++ {
++ return true;
++ }
++ }
++ return false;
++ }
+
-+ if (value == null || value.length() == 0)
++ @Override
++ public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ for(CustomObject object: world.getSettings().customObjects.values())
+ {
-+ value = defaultValue;
- }
-
- return value;
-diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java
-index 91ebb22dc..d30e7de52 100644
---- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java
-+++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java
-@@ -28,6 +28,7 @@
-
- public class ConfigResolverTest
- {
-+ private static final String DEFAULT_VALUE = ""defaultValue"";
- @Test
- public void testOverruledValue()
- {
-@@ -60,12 +61,43 @@ public void testGetProjectStageAwarePropertyValue()
- Assert.assertNull(ConfigResolver.getProjectStageAwarePropertyValue(""notexisting"", null));
-
- Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyValue(""testkey"", null));
-+ Assert.assertEquals(""unittestvalue"", ConfigResolver.getProjectStageAwarePropertyValue(""testkey""));
- Assert.assertEquals(""unittestvalue"", ConfigResolver.getProjectStageAwarePropertyValue(""testkey"", null));
-
- Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyValue(""testkey2"", null));
-+ Assert.assertEquals(""testvalue"", ConfigResolver.getProjectStageAwarePropertyValue(""testkey2""));
- Assert.assertEquals(""testvalue"", ConfigResolver.getProjectStageAwarePropertyValue(""testkey2"", null));
-
- Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyValue(""testkey3"", null));
-- Assert.assertEquals("""", ConfigResolver.getProjectStageAwarePropertyValue(""testkey3"", null));
-+ Assert.assertEquals("""", ConfigResolver.getProjectStageAwarePropertyValue(""testkey3""));
-+ Assert.assertEquals(DEFAULT_VALUE, ConfigResolver.getProjectStageAwarePropertyValue(""testkey3"", DEFAULT_VALUE));
++ object.process(world, random, chunkX, chunkZ);
++ }
+ }
+
-+ @Test
-+ public void testGetPropertyAwarePropertyValue() {
-+ ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
++ @Override
++ public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ for(CustomObject object: world.getSettings().customObjects.values())
++ {
++ object.processAsTree(world, random, chunkX, chunkZ);
++ }
++ }
+
-+ Assert.assertNull(ConfigResolver.getPropertyAwarePropertyValue(""notexisting"", null));
++ @Override
++ public CustomObject applySettings(Map settings)
++ {
++ // Not supported
++ return this;
++ }
+
-+ Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyValue(""testkey"", null));
-+ Assert.assertEquals(""unittestvalue"", ConfigResolver.getPropertyAwarePropertyValue(""testkey"", ""dbvendor""));
-+ Assert.assertEquals(""unittestvalue"", ConfigResolver.getPropertyAwarePropertyValue(""testkey"", ""dbvendor"", null));
++ @Override
++ public boolean hasPreferenceToSpawnIn(LocalBiome biome)
++ {
++ // Never, ever spawn this in UseWorld. It would cause an infinite loop.
++ return false;
++ }
+
-+ Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyValue(""testkey2"", null));
-+ Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyAwarePropertyValue(""testkey2"", ""dbvendor""));
-+ Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyAwarePropertyValue(""testkey2"", ""dbvendor"", null));
++}
+diff --git a/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2.java b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2.java
+new file mode 100644
+index 000000000..638fe02bf
+--- /dev/null
++++ b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2.java
+@@ -0,0 +1,454 @@
++package com.khorn.terraincontrol.customobjects.bo2;
+
-+ Assert.assertEquals(""testvalue"", ConfigResolver.getPropertyValue(""testkey3"", null));
-+ Assert.assertEquals("""", ConfigResolver.getPropertyAwarePropertyValue(""testkey3"", ""dbvendor""));
-+ Assert.assertEquals(DEFAULT_VALUE, ConfigResolver.getPropertyAwarePropertyValue(""testkey3"", ""dbvendor"", DEFAULT_VALUE));
++import java.io.File;
++import java.io.IOException;
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.HashSet;
++import java.util.Map;
++import java.util.Random;
+
-+ Assert.assertEquals(""TestDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendor""));
-+ Assert.assertEquals(""PostgreDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendor2""));
-+ Assert.assertEquals(""DefaultDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendorX""));
++import com.khorn.terraincontrol.DefaultMaterial;
++import com.khorn.terraincontrol.LocalBiome;
++import com.khorn.terraincontrol.LocalWorld;
++import com.khorn.terraincontrol.configuration.ConfigFile;
++import com.khorn.terraincontrol.customobjects.BODefaultValues;
++import com.khorn.terraincontrol.customobjects.CustomObject;
++import com.khorn.terraincontrol.customobjects.ObjectCoordinate;
+
-+ Assert.assertEquals(""TestDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendor"", null));
-+ Assert.assertEquals(""PostgreDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendor2"", null));
-+ Assert.assertEquals(""DefaultDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendorX"", null));
-+ Assert.assertEquals(DEFAULT_VALUE, ConfigResolver.getPropertyAwarePropertyValue(""dataSourceX"", ""dbvendorX"", DEFAULT_VALUE));
- }
- }
-diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java
-index e9e066fba..d0f2c938b 100644
---- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java
-+++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java
-@@ -48,6 +48,20 @@ public TestConfigSource()
- // a value which got ProjectStage overloaded to an empty value
- props.put(""testkey3"", ""testvalue"");
- props.put(""testkey3.UnitTest"", """");
++/**
++ * The good old BO2.
++ *
++ */
++public class BO2 extends ConfigFile implements CustomObject
++{
++ public ObjectCoordinate[][] Data = new ObjectCoordinate[4][];
+
-+ // now for the PropertyAware tests
-+ props.put(""dbvendor.UnitTest"", ""mysql"");
-+ props.put(""dbvendor"", ""postgresql"");
++ public BO2[] GroupObjects = null;
+
-+ props.put(""dataSource.mysql.Production"", ""java:/comp/env/MyDs"");
-+ props.put(""dataSource.mysql.UnitTest"", ""TestDataSource"");
-+ props.put(""dataSource.postgresql"", ""PostgreDataSource"");
-+ props.put(""dataSource"", ""DefaultDataSource"");
++ public String Name;
+
-+ // another one
-+ props.put(""dbvendor2.Production"", ""mysql"");
-+ props.put(""dbvendor2"", ""postgresql"");
++ public HashSet SpawnInBiome;
+
- }
-
- @Override"
-3cf09ec9a51263838270cb5f62d5b34cb58f26bb,Vala,"clutter-1.0: add missing type_arguments for several new methods
-
-Partially fixes bug 609875.
-",c,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
-1cda4eacbf8e44d03ecdfb6f16ab523306677cbc,restlet-framework-java, - The Request-isConfidential() method has- been refactored to be supported by Message and Response as well.- The method Request-setConfidential() has been removed (back to- Restlet 1.0 state). Added Protocol-isConfidential() method to- support the new implementation which rely on Request-getProtocol().- Reported by Kevin Conaway.--,p,https://github.com/restlet/restlet-framework-java,"diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
-index 3bb3740fe2..51208741e0 100644
---- a/build/tmpl/text/changes.txt
-+++ b/build/tmpl/text/changes.txt
-@@ -44,6 +44,12 @@ Changes log
- ""style"" attributes are required.
- - Added the ability the give a title to WadlApplication or
- WadlResource instances. Suggested by Jérôme Bernard.
-+ - The Request#isConfidential() method has been refactored to
-+ be supported by Message and Response as well. The method
-+ Request#setConfidential() has been removed (back to Restlet
-+ 1.0 state). Added Protocol#isConfidential() method to support
-+ the new implementation which rely on Request#getProtocol().
-+ Reported by Kevin Conaway.
- - Misc
- - Updated JAX-RS API to version 1.0. The implementation of the
- runtime environment is not fully finished yet. We are
-diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java
-index 4239efb2cf..6d9f19d948 100644
---- a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java
-+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java
-@@ -72,9 +72,6 @@ public void doHandle(Request request, Response response) {
- final Protocol protocol = request.getProtocol();
-
- if (protocol.equals(Protocol.RIAP)) {
-- // Consider that the request is confidential
-- request.setConfidential(true);
--
- // Let's dispatch it
- final LocalReference cr = new LocalReference(request
- .getResourceRef());
-diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java
-index fc66f6e836..d81f983b14 100644
---- a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java
-+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java
-@@ -64,9 +64,6 @@ protected void doHandle(Request request, Response response) {
- final Protocol protocol = request.getProtocol();
-
- if (protocol.equals(Protocol.RIAP)) {
-- // Consider that the request is confidential
-- request.setConfidential(true);
--
- // Let's dispatch it
- final LocalReference cr = new LocalReference(request
- .getResourceRef());
-diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java b/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java
-index ab6f7fa405..120613d7f6 100644
---- a/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java
-+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java
-@@ -103,14 +103,6 @@ public HttpRequest(Context context, HttpServerCall httpCall) {
- // Set the properties
- setMethod(Method.valueOf(httpCall.getMethod()));
-
-- if (getHttpCall().isConfidential()) {
-- setConfidential(true);
-- } else {
-- // We don't want to autocreate the security data just for this
-- // information, because that will by the default value of this
-- // property if read by someone.
-- }
--
- // Set the host reference
- final StringBuilder sb = new StringBuilder();
- sb.append(httpCall.getProtocol().getSchemeName()).append(""://"");
-diff --git a/modules/org.restlet/src/org/restlet/data/Message.java b/modules/org.restlet/src/org/restlet/data/Message.java
-index d5ba7847fc..72fdfcd15e 100644
---- a/modules/org.restlet/src/org/restlet/data/Message.java
-+++ b/modules/org.restlet/src/org/restlet/data/Message.java
-@@ -78,49 +78,50 @@ public Message(Representation entity) {
- this.saxRepresentation = null;
- }
-
--/**
-- * Returns the modifiable map of attributes that can be used by developers
-- * to save information relative to the message. Creates a new instance if no
-- * one has been set. This is an easier alternative to the creation of a
-- * wrapper instance around the whole message.
-- *
-- *
-- * In addition, this map is a shared space between the developer and the
-- * connectors. In this case, it is used to exchange information that is not
-- * uniform across all protocols and couldn't therefore be directly included
-- * in the API. For this purpose, all attribute names starting with
-- * ""org.restlet"" are reserved. Currently the following attributes are used:
-- *
-- *
-- * | Attribute name |
-- * Class name |
-- * Description |
-- *
-- *
-- * | org.restlet.http.headers |
-- * org.restlet.data.Form |
-- * Server HTTP connectors must provide all request headers and client
-- * HTTP connectors must provide all response headers, exactly as they were
-- * received. In addition, developers can also use this attribute to specify
-- * non-standard headers that should be added to the request or to
-- * the response. |
-- *
-- *
-- * | org.restlet.https.clientCertificates |
-- * List |
-- * For requests received via a secure connector, indicates the ordered
-- * list of client certificates, if they are available and accessible. |
-- *
-- *
-- * Most of the standard HTTP headers are directly supported via the Restlet
-- * API. Thus, adding such HTTP headers is forbidden because it could
-- * conflict with the connector's internal behavior, limit portability or
-- * prevent future optimizations. The other standard HTTP headers (that are
-- * not supported) can be added as attributes via the
-- * ""org.restlet.http.headers"" key.
-- *
-- * @return The modifiable attributes map.
-- */
-+ /**
-+ * Returns the modifiable map of attributes that can be used by developers
-+ * to save information relative to the message. Creates a new instance if no
-+ * one has been set. This is an easier alternative to the creation of a
-+ * wrapper instance around the whole message.
-+ *
-+ *
-+ * In addition, this map is a shared space between the developer and the
-+ * connectors. In this case, it is used to exchange information that is not
-+ * uniform across all protocols and couldn't therefore be directly included
-+ * in the API. For this purpose, all attribute names starting with
-+ * ""org.restlet"" are reserved. Currently the following attributes are used:
-+ *
-+ *
-+ * | Attribute name |
-+ * Class name |
-+ * Description |
-+ *
-+ *
-+ * | org.restlet.http.headers |
-+ * org.restlet.data.Form |
-+ * Server HTTP connectors must provide all request headers and client
-+ * HTTP connectors must provide all response headers, exactly as they were
-+ * received. In addition, developers can also use this attribute to specify
-+ * non-standard headers that should be added to the request or to the
-+ * response. |
-+ *
-+ *
-+ * | org.restlet.https.clientCertificates |
-+ * List |
-+ * For requests received via a secure connector, indicates the ordered
-+ * list of client certificates, if they are available and accessible. |
-+ *
-+ *
-+ *
-+ * Most of the standard HTTP headers are directly supported via the Restlet
-+ * API. Thus, adding such HTTP headers is forbidden because it could
-+ * conflict with the connector's internal behavior, limit portability or
-+ * prevent future optimizations. The other standard HTTP headers (that are
-+ * not supported) can be added as attributes via the
-+ * ""org.restlet.http.headers"" key.
-+ *
-+ * @return The modifiable attributes map.
-+ */
- public Map getAttributes() {
- if (this.attributes == null) {
- this.attributes = new TreeMap();
-@@ -234,6 +235,14 @@ public SaxRepresentation getEntityAsSax() {
- return this.saxRepresentation;
- }
-
-+ /**
-+ * Indicates if the message was or will be exchanged confidentially, for
-+ * example via a SSL-secured connection.
-+ *
-+ * @return True if the message is confidential.
-+ */
-+ public abstract boolean isConfidential();
++ public String Version;
++ public HashSet SpawnOnBlockType;
+
- /**
- * Indicates if a content is available and can be sent. Several conditions
- * must be met: the content must exists and have some available data.
-diff --git a/modules/org.restlet/src/org/restlet/data/Protocol.java b/modules/org.restlet/src/org/restlet/data/Protocol.java
-index f21d806ff5..65669bbd3e 100644
---- a/modules/org.restlet/src/org/restlet/data/Protocol.java
-+++ b/modules/org.restlet/src/org/restlet/data/Protocol.java
-@@ -59,7 +59,7 @@ public final class Protocol extends Metadata {
- * @see org.restlet.data.LocalReference
- */
- public static final Protocol CLAP = new Protocol(""clap"", ""CLAP"",
-- ""Class Loader Access Protocol"", UNKNOWN_PORT);
-+ ""Class Loader Access Protocol"", UNKNOWN_PORT, true);
-
- /**
- * FILE is a standard scheme to access to representations stored in the file
-@@ -72,7 +72,7 @@ public final class Protocol extends Metadata {
- * @see org.restlet.data.LocalReference
- */
- public static final Protocol FILE = new Protocol(""file"", ""FILE"",
-- ""Local File System Protocol"", UNKNOWN_PORT);
-+ ""Local File System Protocol"", UNKNOWN_PORT, true);
-
- /** FTP protocol. */
- public static final Protocol FTP = new Protocol(""ftp"", ""FTP"",
-@@ -84,7 +84,7 @@ public final class Protocol extends Metadata {
-
- /** HTTPS protocol (via SSL socket). */
- public static final Protocol HTTPS = new Protocol(""https"", ""HTTPS"",
-- ""HyperText Transport Protocol (Secure)"", 443);
-+ ""HyperText Transport Protocol (Secure)"", 443, true);
-
- /**
- * JAR (Java ARchive) is a common scheme to access to representations inside
-@@ -94,7 +94,7 @@ public final class Protocol extends Metadata {
- * @see org.restlet.data.LocalReference
- */
- public static final Protocol JAR = new Protocol(""jar"", ""JAR"",
-- ""Java ARchive"", UNKNOWN_PORT);
-+ ""Java ARchive"", UNKNOWN_PORT, true);
-
- /** JDBC protocol. */
- public static final Protocol JDBC = new Protocol(""jdbc"", ""JDBC"",
-@@ -106,7 +106,7 @@ public final class Protocol extends Metadata {
-
- /** POPS protocol (via SSL/TLS socket).. */
- public static final Protocol POPS = new Protocol(""pops"", ""POPS"",
-- ""Post Office Protocol (Secure)"", 995);
-+ ""Post Office Protocol (Secure)"", 995, true);
-
- /**
- * RIAP (Restlet Internal Access Protocol) is a custom scheme to access
-@@ -120,7 +120,7 @@ public final class Protocol extends Metadata {
- * @see org.restlet.data.LocalReference
- */
- public static final Protocol RIAP = new Protocol(""riap"", ""RIAP"",
-- ""Restlet Internal Access Protocol"", UNKNOWN_PORT);
-+ ""Restlet Internal Access Protocol"", UNKNOWN_PORT, true);
-
- /** SMTP protocol. */
- public static final Protocol SMTP = new Protocol(""smtp"", ""SMTP"",
-@@ -135,15 +135,16 @@ public final class Protocol extends Metadata {
- @Deprecated
- public static final Protocol SMTP_STARTTLS = new Protocol(""smtp"",
- ""SMTP_STARTTLS"",
-- ""Simple Mail Transfer Protocol (starting a TLS encryption)"", 25);
-+ ""Simple Mail Transfer Protocol (starting a TLS encryption)"", 25,
-+ true);
-
- /** SMTPS protocol (via SSL/TLS socket). */
- public static final Protocol SMTPS = new Protocol(""smtps"", ""SMTPS"",
-- ""Simple Mail Transfer Protocol (Secure)"", 465);
-+ ""Simple Mail Transfer Protocol (Secure)"", 465, true);
-
- /** Local Web Archive access protocol. */
- public static final Protocol WAR = new Protocol(""war"", ""WAR"",
-- ""Web Archive Access Protocol"", UNKNOWN_PORT);
-+ ""Web Archive Access Protocol"", UNKNOWN_PORT, true);
-
- /**
- * Creates the protocol associated to a URI scheme name. If an existing
-@@ -195,6 +196,9 @@ public static Protocol valueOf(final String name) {
- return result;
- }
-
-+ /** The confidentiality. */
-+ private volatile boolean confidential;
++ public HashSet CollisionBlockType;
+
- /** The default port if known or -1. */
- private volatile int defaultPort;
-
-@@ -226,9 +230,30 @@ public Protocol(final String schemeName) {
- */
- public Protocol(final String schemeName, final String name,
- final String description, int defaultPort) {
-+ this(schemeName, name, description, defaultPort, false);
++ public boolean SpawnWater;
++ public boolean SpawnLava;
++ public boolean SpawnAboveGround;
++ public boolean SpawnUnderGround;
++
++ public boolean SpawnSunlight;
++ public boolean SpawnDarkness;
++
++ public boolean UnderFill;
++ public boolean RandomRotation;
++ public boolean Dig;
++ public boolean Tree;
++ public boolean Branch;
++ public boolean DiggingBranch;
++ public boolean NeedsFoundation;
++ public int Rarity;
++ public double CollisionPercentage;
++ public int SpawnElevationMin;
++ public int SpawnElevationMax;
++
++ public int GroupFrequencyMin;
++ public int GroupFrequencyMax;
++ public int GroupSeparationMin;
++ public int GroupSeparationMax;
++ public String GroupId;
++
++ public int BranchLimit;
++
++ public BO2(File file, String name)
++ {
++ ReadSettingsFile(file);
++ this.Name = name;
++
++ ReadConfigSettings();
++ CorrectSettings();
+ }
+
-+ /**
-+ * Constructor.
-+ *
-+ * @param schemeName
-+ * The scheme name.
-+ * @param name
-+ * The unique name.
-+ * @param description
-+ * The description.
-+ * @param defaultPort
-+ * The default port.
-+ * @param confidential
-+ * The confidentiality.
-+ */
-+ public Protocol(final String schemeName, final String name,
-+ final String description, int defaultPort,
-+ final boolean confidential) {
- super(name, description);
- this.schemeName = schemeName;
- this.defaultPort = defaultPort;
-+ this.confidential = confidential;
- }
-
- /** {@inheritDoc} */
-@@ -261,4 +286,15 @@ public String getSchemeName() {
- public int hashCode() {
- return (getName() == null) ? 0 : getName().toLowerCase().hashCode();
- }
++ public BO2(Map settings, String name)
++ {
++ SettingsCache = settings;
++ this.Name = name;
+
-+ /**
-+ * Indicates if the protocol guarantees the confidentially of the messages
-+ * exchanged, for example via a SSL-secured connection.
-+ *
-+ * @return True if the protocol is confidential.
-+ */
-+ public boolean isConfidential() {
-+ return this.confidential;
++ ReadConfigSettings();
++ CorrectSettings();
+ }
+
- }
-diff --git a/modules/org.restlet/src/org/restlet/data/Request.java b/modules/org.restlet/src/org/restlet/data/Request.java
-index 9c81cbd5d5..300e05e0ab 100644
---- a/modules/org.restlet/src/org/restlet/data/Request.java
-+++ b/modules/org.restlet/src/org/restlet/data/Request.java
-@@ -109,9 +109,6 @@ public static Request getCurrent() {
- /** The condition data. */
- private volatile Conditions conditions;
-
-- /** Indicates if the call came over a confidential channel. */
-- private volatile boolean confidential;
--
- /** The cookies provided by the client. */
- private volatile Series cookies;
-
-@@ -140,7 +137,6 @@ public static Request getCurrent() {
- * Constructor.
- */
- public Request() {
-- this.confidential = false;
- }
-
- /**
-@@ -387,13 +383,12 @@ public Reference getRootRef() {
- }
-
- /**
-- * Indicates if the call came over a confidential channel such as an
-- * SSL-secured connection.
-- *
-- * @return True if the call came over a confidential channel.
-+ * Implemented based on the {@link Protocol#isConfidential()} method for the
-+ * request's protocol returned by {@link #getProtocol()};
- */
+ @Override
- public boolean isConfidential() {
-- return this.confidential;
-+ return (getProtocol() == null) ? false : getProtocol().isConfidential();
- }
-
- /**
-@@ -444,17 +439,6 @@ public void setConditions(Conditions conditions) {
- this.conditions = conditions;
- }
-
-- /**
-- * Indicates if the call came over a confidential channel such as an
-- * SSL-secured connection.
-- *
-- * @param confidential
-- * True if the call came over a confidential channel.
-- */
-- public void setConfidential(boolean confidential) {
-- this.confidential = confidential;
-- }
--
- /**
- * Sets the cookies provided by the client.
- *
-diff --git a/modules/org.restlet/src/org/restlet/data/Response.java b/modules/org.restlet/src/org/restlet/data/Response.java
-index cd34d0b5a1..b88c96c3ef 100644
---- a/modules/org.restlet/src/org/restlet/data/Response.java
-+++ b/modules/org.restlet/src/org/restlet/data/Response.java
-@@ -307,6 +307,11 @@ public Status getStatus() {
- return this.status;
- }
-
++ public String getName()
++ {
++ return this.Name;
++ }
++
+ @Override
-+ public boolean isConfidential() {
-+ return getRequest().isConfidential();
++ public boolean canSpawnAsTree()
++ {
++ return Tree;
+ }
+
- /**
- * Permanently redirects the client to a target URI. The client is expected
- * to reuse the same method for the new request.
-diff --git a/modules/org.restlet/src/org/restlet/util/WrapperRequest.java b/modules/org.restlet/src/org/restlet/util/WrapperRequest.java
-index 039e608531..a8c52196d0 100644
---- a/modules/org.restlet/src/org/restlet/util/WrapperRequest.java
-+++ b/modules/org.restlet/src/org/restlet/util/WrapperRequest.java
-@@ -315,18 +315,6 @@ public void setChallengeResponse(ChallengeResponse response) {
- getWrappedRequest().setChallengeResponse(response);
- }
-
-- /**
-- * Indicates if the call came over a confidential channel such as an
-- * SSL-secured connection.
-- *
-- * @param confidential
-- * True if the call came over a confidential channel.
-- */
-- @Override
-- public void setConfidential(boolean confidential) {
-- getWrappedRequest().setConfidential(confidential);
-- }
--
- /**
- * Sets the entity from a higher-level object. This object is converted to a
- * representation using the Application's converter service. If you want to
-diff --git a/modules/org.restlet/src/org/restlet/util/WrapperResponse.java b/modules/org.restlet/src/org/restlet/util/WrapperResponse.java
-index f75306c2c1..1fc4fdf01d 100644
---- a/modules/org.restlet/src/org/restlet/util/WrapperResponse.java
-+++ b/modules/org.restlet/src/org/restlet/util/WrapperResponse.java
-@@ -301,6 +301,17 @@ protected Response getWrappedResponse() {
- return this.wrappedResponse;
- }
-
-+ /**
-+ * Indicates if the call came over a confidential channel such as an
-+ * SSL-secured connection.
-+ *
-+ * @return True if the call came over a confidential channel.
-+ */
+ @Override
-+ public boolean isConfidential() {
-+ return getWrappedResponse().isConfidential();
++ public boolean canSpawnAsObject()
++ {
++ return true;
+ }
+
- /**
- * Indicates if a content is available and can be sent. Several conditions
- * must be met: the content must exists and have some available data."
-8ee632caa79b92b1af98684f83b01c3447a119ee,hadoop,YARN-2740. Fix NodeLabelsManager to properly handle- node label modifications when distributed node label configuration enabled.- (Naganarasimha G R via wangda)--(cherry picked from commit db1b674b50ddecf2774f4092d677c412722bdcb1)-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
-index 20de1edb7efbe..ca9247f13eb2d 100644
---- a/hadoop-yarn-project/CHANGES.txt
-+++ b/hadoop-yarn-project/CHANGES.txt
-@@ -217,6 +217,9 @@ Release 2.8.0 - UNRELEASED
- YARN-3530. ATS throws exception on trying to filter results without otherinfo.
- (zhijie shen via xgong)
-
-+ YARN-2740. Fix NodeLabelsManager to properly handle node label modifications
-+ when distributed node label configuration enabled. (Naganarasimha G R via wangda)
++ @Override
++ public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
++ {
++ if (!ObjectCanSpawn(world, x, y, z))
++ {
++ return false;
++ }
+
- Release 2.7.1 - UNRELEASED
-
- INCOMPATIBLE CHANGES
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
-index c8f9648147fb3..4dd01d24bb8d9 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
-@@ -1779,6 +1779,12 @@ private static void addDeprecatedKeys() {
- public static final String DEFAULT_NODELABEL_CONFIGURATION_TYPE =
- CENTALIZED_NODELABEL_CONFIGURATION_TYPE;
-
-+ @Private
-+ public static boolean isDistributedNodeLabelConfiguration(Configuration conf) {
-+ return DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE.equals(conf.get(
-+ NODELABEL_CONFIGURATION_TYPE, DEFAULT_NODELABEL_CONFIGURATION_TYPE));
-+ }
++ ObjectCoordinate[] data = Data[0];
++ if (RandomRotation)
++ data = Data[random.nextInt(4)];
+
- public YarnConfiguration() {
- super();
- }
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
-index 7493169201ebc..f2ff0f629971c 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
-@@ -97,6 +97,8 @@ public class CommonNodeLabelsManager extends AbstractService {
- protected NodeLabelsStore store;
- private boolean nodeLabelsEnabled = false;
-
-+ private boolean isDistributedNodeLabelConfiguration = false;
++ int faultCounter = 0;
+
- /**
- * A Host can have multiple Nodes
- */
-@@ -213,6 +215,10 @@ protected void serviceInit(Configuration conf) throws Exception {
- nodeLabelsEnabled =
- conf.getBoolean(YarnConfiguration.NODE_LABELS_ENABLED,
- YarnConfiguration.DEFAULT_NODE_LABELS_ENABLED);
++ for (ObjectCoordinate point : data)
++ {
++ if (!world.isLoaded((x + point.x), (y + point.y), (z + point.z)))
++ return false;
+
-+ isDistributedNodeLabelConfiguration =
-+ YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
++ if (!Dig)
++ {
++ if (CollisionBlockType.contains(world.getTypeId((x + point.x), (y + point.y), (z + point.z))))
++ {
++ faultCounter++;
++ if (faultCounter > (data.length * (CollisionPercentage / 100)))
++ {
++ return false;
++ }
++ }
++ }
+
- if (nodeLabelsEnabled) {
- initNodeLabelStore(conf);
- }
-@@ -223,7 +229,7 @@ protected void serviceInit(Configuration conf) throws Exception {
- protected void initNodeLabelStore(Configuration conf) throws Exception {
- this.store = new FileSystemNodeLabelsStore(this);
- this.store.init(conf);
-- this.store.recover();
-+ this.store.recover(isDistributedNodeLabelConfiguration);
- }
-
- // for UT purpose
-@@ -613,7 +619,10 @@ protected void internalUpdateLabelsOnNodes(
- }
- }
-
-- if (null != dispatcher) {
-+ if (null != dispatcher && !isDistributedNodeLabelConfiguration) {
-+ // In case of DistributedNodeLabelConfiguration, no need to save the the
-+ // NodeLabels Mapping to the back-end store, as on RM restart/failover
-+ // NodeLabels are collected from NM through Register/Heartbeat again
- dispatcher.getEventHandler().handle(
- new UpdateNodeToLabelsMappingsEvent(newNMToLabels));
- }
-@@ -799,8 +808,10 @@ public List getClusterNodeLabels() {
- readLock.lock();
- List nodeLabels = new ArrayList<>();
- for (RMNodeLabel label : labelCollections.values()) {
-- nodeLabels.add(NodeLabel.newInstance(label.getLabelName(),
-- label.getIsExclusive()));
-+ if (!label.getLabelName().equals(NO_LABEL)) {
-+ nodeLabels.add(NodeLabel.newInstance(label.getLabelName(),
-+ label.getIsExclusive()));
+ }
- }
- return nodeLabels;
- } finally {
-@@ -824,7 +835,6 @@ public boolean isExclusiveNodeLabel(String nodeLabel) throws IOException {
- readLock.unlock();
- }
- }
--
-
- private void checkAndThrowLabelName(String label) throws IOException {
- if (label == null || label.isEmpty() || label.length() > MAX_LABEL_LENGTH) {
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
-index ea185f2c0a248..f26e2048a02cd 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
-@@ -154,8 +154,12 @@ public void removeClusterNodeLabels(Collection labels)
- ensureCloseEditlogFile();
- }
-
-+ /* (non-Javadoc)
-+ * @see org.apache.hadoop.yarn.nodelabels.NodeLabelsStore#recover(boolean)
-+ */
- @Override
-- public void recover() throws YarnException, IOException {
-+ public void recover(boolean ignoreNodeToLabelsMappings) throws YarnException,
-+ IOException {
- /*
- * Steps of recover
- * 1) Read from last mirror (from mirror or mirror.old)
-@@ -222,7 +226,15 @@ public void recover() throws YarnException, IOException {
- new ReplaceLabelsOnNodeRequestPBImpl(
- ReplaceLabelsOnNodeRequestProto.parseDelimitedFrom(is))
- .getNodeToLabels();
-- mgr.replaceLabelsOnNode(map);
-+ if (!ignoreNodeToLabelsMappings) {
-+ /*
-+ * In case of Distributed NodeLabels setup,
-+ * ignoreNodeToLabelsMappings will be set to true and recover will
-+ * be invoked. As RM will collect the node labels from NM through
-+ * registration/HB
-+ */
-+ mgr.replaceLabelsOnNode(map);
++
++ for (ObjectCoordinate point : data)
++ {
++
++ if (world.getTypeId(x + point.x, y + point.y, z + point.z) == 0)
++ {
++ world.setBlock((x + point.x), y + point.y, z + point.z, point.BlockId, point.BlockData, true, false, true);
++ } else if (Dig)
++ {
++ world.setBlock((x + point.x), y + point.y, z + point.z, point.BlockId, point.BlockData, true, false, true);
+ }
- break;
- }
- }
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java
-index 47b7370dff843..46b94fd0d5c9a 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java
-@@ -56,9 +56,18 @@ public abstract void removeClusterNodeLabels(Collection labels)
- throws IOException;
-
- /**
-- * Recover labels and node to labels mappings from store
-+ * Recover labels and node to labels mappings from store, but if
-+ * ignoreNodeToLabelsMappings is true then node to labels mappings should not
-+ * be recovered. In case of Distributed NodeLabels setup
-+ * ignoreNodeToLabelsMappings will be set to true and recover will be invoked
-+ * as RM will collect the node labels from NM through registration/HB
-+ *
-+ * @param ignoreNodeToLabelsMappings
-+ * @throws IOException
-+ * @throws YarnException
- */
-- public abstract void recover() throws IOException, YarnException;
-+ public abstract void recover(boolean ignoreNodeToLabelsMappings)
-+ throws IOException, YarnException;
-
- public void init(Configuration conf) throws Exception {}
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java
-index 48d6dc877154b..fce663a1c952c 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java
-@@ -39,7 +39,8 @@ public void initNodeLabelStore(Configuration conf) {
- this.store = new NodeLabelsStore(this) {
-
- @Override
-- public void recover() throws IOException {
-+ public void recover(boolean ignoreNodeToLabelsMappings)
-+ throws IOException {
- }
-
- @Override
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java
-index beb2cf8585851..09838b43ada1d 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java
-@@ -554,4 +554,29 @@ private void verifyNodeLabelAdded(Set expectedAddedLabelNames,
- Assert.assertTrue(expectedAddedLabelNames.contains(label.getName()));
- }
- }
+
-+ @Test(timeout = 5000)
-+ public void testReplaceLabelsOnNodeInDistributedMode() throws Exception {
-+ //create new DummyCommonNodeLabelsManager than the one got from @before
-+ mgr.stop();
-+ mgr = new DummyCommonNodeLabelsManager();
-+ Configuration conf = new YarnConfiguration();
-+ conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true);
-+ conf.set(YarnConfiguration.NODELABEL_CONFIGURATION_TYPE,
-+ YarnConfiguration.DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE);
++ }
++ return true;
++ }
+
-+ mgr.init(conf);
-+ mgr.start();
++ @Override
++ public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
++ {
++ if (!Tree)
++ {
++ // Can only spawn as a tree if this is a tree.
++ return false;
++ }
++ return spawn(world, random, x, y, z);
++ }
+
-+ mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p1"", ""p2"", ""p3""));
-+ mgr.replaceLabelsOnNode(ImmutableMap.of(toNodeId(""n1""), toSet(""p1"")));
-+ Set labelsByNode = mgr.getLabelsByNode(toNodeId(""n1""));
++ @Override
++ public boolean spawn(LocalWorld world, Random random, int x, int z)
++ {
++ int y;
++ if (SpawnAboveGround)
++ y = world.getSolidHeight(x, z);
++ else if (SpawnUnderGround)
++ {
++ int solidHeight = world.getSolidHeight(x, z);
++ if (solidHeight < 1 || solidHeight <= SpawnElevationMin)
++ return false;
++ if (solidHeight > SpawnElevationMax)
++ solidHeight = SpawnElevationMax;
++ y = random.nextInt(solidHeight - SpawnElevationMin) + SpawnElevationMin;
++ } else
++ y = world.getHighestBlockYAt(x, z);
+
-+ Assert.assertNull(
-+ ""Labels are not expected to be written to the NodeLabelStore"",
-+ mgr.lastNodeToLabels);
-+ Assert.assertNotNull(""Updated labels should be available from the Mgr"",
-+ labelsByNode);
-+ Assert.assertTrue(labelsByNode.contains(""p1""));
-+ }
- }
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
-index f070c205f5a1c..fb60cd6a6427c 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
-@@ -144,6 +144,40 @@ public void testRecoverWithMirror() throws Exception {
- mgr.stop();
- }
-
-+ @SuppressWarnings({ ""unchecked"", ""rawtypes"" })
-+ @Test(timeout = 10000)
-+ public void testRecoverWithDistributedNodeLabels() throws Exception {
-+ mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p1"", ""p2"", ""p3""));
-+ mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p4""));
-+ mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p5"", ""p6""));
-+ mgr.replaceLabelsOnNode((Map) ImmutableMap.of(toNodeId(""n1""), toSet(""p1""),
-+ toNodeId(""n2""), toSet(""p2"")));
-+ mgr.replaceLabelsOnNode((Map) ImmutableMap.of(toNodeId(""n3""), toSet(""p3""),
-+ toNodeId(""n4""), toSet(""p4""), toNodeId(""n5""), toSet(""p5""),
-+ toNodeId(""n6""), toSet(""p6""), toNodeId(""n7""), toSet(""p6"")));
++ if (y < 0)
++ return false;
+
-+ mgr.removeFromClusterNodeLabels(toSet(""p1""));
-+ mgr.removeFromClusterNodeLabels(Arrays.asList(""p3"", ""p5""));
-+ mgr.stop();
++ if (!ObjectCanSpawn(world, x, y, z))
++ return false;
+
-+ mgr = new MockNodeLabelManager();
-+ Configuration cf = new Configuration(conf);
-+ cf.set(YarnConfiguration.NODELABEL_CONFIGURATION_TYPE,
-+ YarnConfiguration.DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE);
-+ mgr.init(cf);
++ boolean objectSpawned = this.spawn(world, random, x, y, z);
+
-+ // check variables
-+ Assert.assertEquals(3, mgr.getClusterNodeLabels().size());
-+ Assert.assertTrue(mgr.getClusterNodeLabelNames().containsAll(
-+ Arrays.asList(""p2"", ""p4"", ""p6"")));
++ if (objectSpawned)
++ GenerateCustomObjectFromGroup(world, random, x, y, z);
+
-+ Assert.assertTrue(""During recovery in distributed node-labels setup, ""
-+ + ""node to labels mapping should not be recovered "", mgr
-+ .getNodeLabels().size() == 0);
++ return objectSpawned;
++ }
+
-+ mgr.stop();
-+ }
++ @Override
++ public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
++ {
++ return spawn(world, random, x, z);
++ }
+
- @SuppressWarnings({ ""unchecked"", ""rawtypes"" })
- @Test(timeout = 10000)
- public void testEditlogRecover() throws Exception {
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
-index c921326fbdce3..0ad90c0ed4c6b 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
-@@ -112,6 +112,9 @@ public class AdminService extends CompositeService implements
- private final RecordFactory recordFactory =
- RecordFactoryProvider.getRecordFactory(null);
-
-+ @VisibleForTesting
-+ boolean isDistributedNodeLabelConfiguration = false;
++ @Override
++ public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ int randomRoll = random.nextInt(100);
++ int ObjectRarity = Rarity;
+
- public AdminService(ResourceManager rm, RMContext rmContext) {
- super(AdminService.class.getName());
- this.rm = rm;
-@@ -141,6 +144,10 @@ public void serviceInit(Configuration conf) throws Exception {
- YarnConfiguration.DEFAULT_YARN_ADMIN_ACL)), UserGroupInformation
- .getCurrentUser());
- rmId = conf.get(YarnConfiguration.RM_HA_ID);
++ while (randomRoll < ObjectRarity)
++ {
++ ObjectRarity -= 100;
+
-+ isDistributedNodeLabelConfiguration =
-+ YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
++ int x = chunkX * 16 + random.nextInt(16);
++ int z = chunkZ * 16 + random.nextInt(16);
+
- super.serviceInit(conf);
- }
-
-@@ -637,32 +644,35 @@ public AddToClusterNodeLabelsResponse addToClusterNodeLabels(AddToClusterNodeLab
- @Override
- public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
- RemoveFromClusterNodeLabelsRequest request) throws YarnException, IOException {
-- String argName = ""removeFromClusterNodeLabels"";
-+ String operation = ""removeFromClusterNodeLabels"";
- final String msg = ""remove labels."";
-- UserGroupInformation user = checkAcls(argName);
-
-- checkRMStatus(user.getShortUserName(), argName, msg);
-+ UserGroupInformation user = checkAcls(operation);
++ spawn(world, random, x, z);
++ }
++ }
+
-+ checkRMStatus(user.getShortUserName(), operation, msg);
-
- RemoveFromClusterNodeLabelsResponse response =
- recordFactory.newRecordInstance(RemoveFromClusterNodeLabelsResponse.class);
- try {
- rmContext.getNodeLabelManager().removeFromClusterNodeLabels(request.getNodeLabels());
- RMAuditLogger
-- .logSuccess(user.getShortUserName(), argName, ""AdminService"");
-+ .logSuccess(user.getShortUserName(), operation, ""AdminService"");
- return response;
- } catch (IOException ioe) {
-- throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
-+ throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
- }
- }
-
- @Override
- public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
- ReplaceLabelsOnNodeRequest request) throws YarnException, IOException {
-- String argName = ""replaceLabelsOnNode"";
-+ String operation = ""replaceLabelsOnNode"";
- final String msg = ""set node to labels."";
-- UserGroupInformation user = checkAcls(argName);
++ @Override
++ public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ if (!Tree)
++ {
++ return;
++ }
++
++ process(world, random, chunkX, chunkZ);
++ }
++
++ @Override
++ public CustomObject applySettings(Map extraSettings)
++ {
++ Map newSettings = new HashMap();
++ newSettings.putAll(SettingsCache);
++ newSettings.putAll(extraSettings);
++ return new BO2(newSettings, getName());
++ }
++
++ @Override
++ protected void WriteConfigSettings() throws IOException
++ {
++ // It doesn't write.
++ }
++
++ @Override
++ protected void ReadConfigSettings()
++ {
++ this.Version = ReadModSettings(BODefaultValues.version.name(), BODefaultValues.version.stringValue());
++
++ this.SpawnOnBlockType = this.ReadBlockList(ReadModSettings(BODefaultValues.spawnOnBlockType.name(), BODefaultValues.spawnOnBlockType.StringArrayListValue()), BODefaultValues.spawnOnBlockType.name());
++ this.CollisionBlockType = this.ReadBlockList(ReadModSettings(BODefaultValues.collisionBlockType.name(), BODefaultValues.collisionBlockType.StringArrayListValue()), BODefaultValues.collisionBlockType.name());
++
++ this.SpawnInBiome = new HashSet(ReadModSettings(BODefaultValues.spawnInBiome.name(), BODefaultValues.spawnInBiome.StringArrayListValue()));
++
++ this.SpawnSunlight = ReadModSettings(BODefaultValues.spawnSunlight.name(), BODefaultValues.spawnSunlight.booleanValue());
++ this.SpawnDarkness = ReadModSettings(BODefaultValues.spawnDarkness.name(), BODefaultValues.spawnDarkness.booleanValue());
++ this.SpawnWater = ReadModSettings(BODefaultValues.spawnWater.name(), BODefaultValues.spawnWater.booleanValue());
++ this.SpawnLava = ReadModSettings(BODefaultValues.spawnLava.name(), BODefaultValues.spawnLava.booleanValue());
++ this.SpawnAboveGround = ReadModSettings(BODefaultValues.spawnAboveGround.name(), BODefaultValues.spawnAboveGround.booleanValue());
++ this.SpawnUnderGround = ReadModSettings(BODefaultValues.spawnUnderGround.name(), BODefaultValues.spawnUnderGround.booleanValue());
++
++ this.UnderFill = ReadModSettings(BODefaultValues.underFill.name(), BODefaultValues.underFill.booleanValue());
++
++ this.RandomRotation = ReadModSettings(BODefaultValues.randomRotation.name(), BODefaultValues.randomRotation.booleanValue());
++ this.Dig = ReadModSettings(BODefaultValues.dig.name(), BODefaultValues.dig.booleanValue());
++ this.Tree = ReadModSettings(BODefaultValues.tree.name(), BODefaultValues.tree.booleanValue());
++ this.Branch = ReadModSettings(BODefaultValues.branch.name(), BODefaultValues.branch.booleanValue());
++ this.DiggingBranch = ReadModSettings(BODefaultValues.diggingBranch.name(), BODefaultValues.diggingBranch.booleanValue());
++ this.NeedsFoundation = ReadModSettings(BODefaultValues.needsFoundation.name(), BODefaultValues.needsFoundation.booleanValue());
++ this.Rarity = ReadModSettings(BODefaultValues.rarity.name(), BODefaultValues.rarity.intValue());
++ this.CollisionPercentage = ReadModSettings(BODefaultValues.collisionPercentage.name(), BODefaultValues.collisionPercentage.intValue());
++ this.SpawnElevationMin = ReadModSettings(BODefaultValues.spawnElevationMin.name(), BODefaultValues.spawnElevationMin.intValue());
++ this.SpawnElevationMax = ReadModSettings(BODefaultValues.spawnElevationMax.name(), BODefaultValues.spawnElevationMax.intValue());
++
++ this.GroupFrequencyMin = ReadModSettings(BODefaultValues.groupFrequencyMin.name(), BODefaultValues.groupFrequencyMin.intValue());
++ this.GroupFrequencyMax = ReadModSettings(BODefaultValues.groupFrequencyMax.name(), BODefaultValues.groupFrequencyMax.intValue());
++ this.GroupSeparationMin = ReadModSettings(BODefaultValues.groupSeperationMin.name(), BODefaultValues.groupSeperationMin.intValue());
++ this.GroupSeparationMax = ReadModSettings(BODefaultValues.groupSeperationMax.name(), BODefaultValues.groupSeperationMax.intValue());
++ this.GroupId = ReadModSettings(BODefaultValues.groupId.name(), BODefaultValues.groupId.stringValue());
++
++ this.BranchLimit = ReadModSettings(BODefaultValues.branchLimit.name(), BODefaultValues.branchLimit.intValue());
++
++ this.ReadCoordinates();
++ }
++
++ @Override
++ protected void CorrectSettings()
++ {
++ // Stub method
++ }
++
++ @Override
++ protected void RenameOldSettings()
++ {
++ // Stub method
++ }
++
++ private void ReadCoordinates()
++ {
++ ArrayList coordinates = new ArrayList();
++
++ for (String key : SettingsCache.keySet())
++ {
++ ObjectCoordinate buffer = ObjectCoordinate.getCoordinateFromString(key, SettingsCache.get(key));
++ if (buffer != null)
++ coordinates.add(buffer);
++ }
++
++ Data[0] = new ObjectCoordinate[coordinates.size()];
++ Data[1] = new ObjectCoordinate[coordinates.size()];
++ Data[2] = new ObjectCoordinate[coordinates.size()];
++ Data[3] = new ObjectCoordinate[coordinates.size()];
++
++ for (int i = 0; i < coordinates.size(); i++)
++ {
++ ObjectCoordinate coordinate = coordinates.get(i);
++
++ Data[0][i] = coordinate;
++ coordinate = coordinate.Rotate();
++ Data[1][i] = coordinate;
++ coordinate = coordinate.Rotate();
++ Data[2][i] = coordinate;
++ coordinate = coordinate.Rotate();
++ Data[3][i] = coordinate;
++ }
++
++ }
++
++ private HashSet ReadBlockList(ArrayList blocks, String settingName)
++ {
++ HashSet output = new HashSet();
++
++ boolean nonIntegerValues = false;
++ boolean all = false;
++ boolean solid = false;
++
++ for (String block : blocks)
++ {
++
++ if (block.equals(BODefaultValues.BO_ALL_KEY.stringValue()))
++ {
++ all = true;
++ continue;
++ }
++ if (block.equals(BODefaultValues.BO_SolidKey.stringValue()))
++ {
++ solid = true;
++ continue;
++ }
++ try
++ {
++ int blockID = Integer.decode(block);
++ if (blockID != 0)
++ output.add(blockID);
++ } catch (NumberFormatException e)
++ {
++ nonIntegerValues = true;
++ }
++ }
++
++ if (all || solid)
++ for (DefaultMaterial material : DefaultMaterial.values())
++ {
++ if (material.id == 0)
++ continue;
++ if (solid && !material.isSolid())
++ continue;
++ output.add(material.id);
++
++ }
++ if (nonIntegerValues)
++ System.out.println(""TerrainControl: Custom object "" + this.Name + "" have wrong value "" + settingName);
++
++ return output;
++
++ }
++
++ public boolean ObjectCanSpawn(LocalWorld world, int x, int y, int z)
++ {
++ if ((world.getTypeId(x, y - 5, z) == 0) && (NeedsFoundation))
++ return false;
++
++ boolean output = true;
++ int checkBlock = world.getTypeId(x, y + 2, z);
++ if (!SpawnWater)
++ output = !((checkBlock == DefaultMaterial.WATER.id) || (checkBlock == DefaultMaterial.STATIONARY_WATER.id));
++ if (!SpawnLava)
++ output = !((checkBlock == DefaultMaterial.LAVA.id) || (checkBlock == DefaultMaterial.STATIONARY_LAVA.id));
++
++ checkBlock = world.getLightLevel(x, y + 2, z);
++ if (!SpawnSunlight)
++ output = !(checkBlock > 8);
++ if (!SpawnDarkness)
++ output = !(checkBlock < 9);
++
++ if ((y < SpawnElevationMin) || (y > SpawnElevationMax))
++ output = false;
++
++ if (!SpawnOnBlockType.contains(world.getTypeId(x, y - 1, z)))
++ output = false;
++
++ return output;
++ }
++
++ public void GenerateCustomObjectFromGroup(LocalWorld world, Random random, int x, int y, int z)
++ {
++ if (GroupObjects == null)
++ return;
++
++ int attempts = 3;
++ if ((GroupFrequencyMax - GroupFrequencyMin) > 0)
++ attempts = GroupFrequencyMin + random.nextInt(GroupFrequencyMax - GroupFrequencyMin);
++
++ while (attempts > 0)
++ {
++ attempts--;
++
++ int objIndex = random.nextInt(GroupObjects.length);
++ BO2 ObjectFromGroup = GroupObjects[objIndex];
++
++ if (Branch)
++ continue;
++
++ x = x + random.nextInt(GroupSeparationMax - GroupSeparationMin) + GroupSeparationMin;
++ z = z + random.nextInt(GroupSeparationMax - GroupSeparationMin) + GroupSeparationMin;
++ int _y;
++
++ if (SpawnAboveGround)
++ _y = world.getSolidHeight(x, z);
++ else if (SpawnUnderGround)
++ {
++ int solidHeight = world.getSolidHeight(x, z);
++ if (solidHeight < 1 || solidHeight <= SpawnElevationMin)
++ continue;
++ if (solidHeight > SpawnElevationMax)
++ solidHeight = SpawnElevationMax;
++ _y = random.nextInt(solidHeight - SpawnElevationMin) + SpawnElevationMin;
++ } else
++ _y = world.getHighestBlockYAt(x, z);
++
++ if (y < 0)
++ continue;
++
++ if ((y - _y) > 10 || (_y - y) > 10)
++ continue;
++
++ ObjectFromGroup.spawn(world, random, x, _y, z);
++ }
++
++ }
++
++ @Override
++ public boolean hasPreferenceToSpawnIn(LocalBiome biome)
++ {
++ return SpawnInBiome.contains(biome.getName()) || SpawnInBiome.contains(""All"");
++ }
++
++}
+diff --git a/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2Loader.java b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2Loader.java
+new file mode 100644
+index 000000000..e7ee8bb76
+--- /dev/null
++++ b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2Loader.java
+@@ -0,0 +1,14 @@
++package com.khorn.terraincontrol.customobjects.bo2;
++
++import java.io.File;
++
++import com.khorn.terraincontrol.customobjects.CustomObject;
++import com.khorn.terraincontrol.customobjects.CustomObjectLoader;
++
++public class BO2Loader implements CustomObjectLoader
++{
++ public CustomObject loadFromFile(String objectName, File file)
++ {
++ return new BO2(file, objectName);
++ }
++}
+diff --git a/common/src/com/khorn/terraincontrol/exception/InvalidResourceException.java b/common/src/com/khorn/terraincontrol/exception/InvalidResourceException.java
+new file mode 100644
+index 000000000..f53a907ae
+--- /dev/null
++++ b/common/src/com/khorn/terraincontrol/exception/InvalidResourceException.java
+@@ -0,0 +1,11 @@
++package com.khorn.terraincontrol.exception;
++
++public class InvalidResourceException extends Exception
++{
++
++ public InvalidResourceException(String string)
++ {
++ super(string);
++ }
++
++}
+diff --git a/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java b/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java
+index a0f81f51b..d0dde206a 100644
+--- a/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java
++++ b/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java
+@@ -1,14 +1,14 @@
+ package com.khorn.terraincontrol.generator;
-- checkRMStatus(user.getShortUserName(), argName, msg);
-+ checkAndThrowIfDistributedNodeLabelConfEnabled(operation);
-+ UserGroupInformation user = checkAcls(operation);
++import java.util.Random;
+
-+ checkRMStatus(user.getShortUserName(), operation, msg);
+ import com.khorn.terraincontrol.DefaultMaterial;
+ import com.khorn.terraincontrol.LocalWorld;
+ import com.khorn.terraincontrol.configuration.BiomeConfig;
+ import com.khorn.terraincontrol.configuration.Resource;
+ import com.khorn.terraincontrol.configuration.TCDefaultValues;
+ import com.khorn.terraincontrol.configuration.WorldConfig;
+-import com.khorn.terraincontrol.generator.resourcegens.ResourceType;
+-
+-import java.util.Random;
++import com.khorn.terraincontrol.generator.resourcegens.SmallLakeGen;
- ReplaceLabelsOnNodeResponse response =
- recordFactory.newRecordInstance(ReplaceLabelsOnNodeResponse.class);
-@@ -670,30 +680,41 @@ public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
- rmContext.getNodeLabelManager().replaceLabelsOnNode(
- request.getNodeToLabels());
- RMAuditLogger
-- .logSuccess(user.getShortUserName(), argName, ""AdminService"");
-+ .logSuccess(user.getShortUserName(), operation, ""AdminService"");
- return response;
- } catch (IOException ioe) {
-- throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
-+ throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
- }
- }
+ public class ObjectSpawner
+ {
+@@ -42,10 +42,10 @@ public void populate(int chunkX, int chunkZ)
+ for (int i = 0; i < localBiomeConfig.ResourceCount; i++)
+ {
+ Resource res = localBiomeConfig.ResourceSequence[i];
+- if (res.Type == ResourceType.SmallLake && Village)
++ if (res instanceof SmallLakeGen && Village)
+ continue;
+- world.setChunksCreations(res.Type.CreateNewChunks);
+- res.Type.Generator.Process(world, rand, res, x, z);
++ world.setChunksCreations(false);
++ res.process(world, rand, chunkX, chunkZ);
+ }
-- private void checkRMStatus(String user, String argName, String msg)
-+ private void checkRMStatus(String user, String operation, String msg)
- throws StandbyException {
- if (!isRMActive()) {
-- RMAuditLogger.logFailure(user, argName, """",
-+ RMAuditLogger.logFailure(user, operation, """",
- ""AdminService"", ""ResourceManager is not active. Can not "" + msg);
- throwStandbyException();
- }
- }
+ // Snow and ice
+@@ -67,10 +67,11 @@ public void populate(int chunkX, int chunkZ)
+ world.setBlock(blockToFreezeX, blockToFreezeY - 1, blockToFreezeZ, biomeConfig.iceBlock, 0);
+ } else
+ {
+- // Snow has to be placed on an empty space on a solid block in the world
++ // Snow has to be placed on an empty space on a
++ // solid block in the world
+ if (world.getMaterial(blockToFreezeX, blockToFreezeY, blockToFreezeZ) == DefaultMaterial.AIR)
+ {
+- if (world.getMaterial(blockToFreezeX, blockToFreezeY - 1, blockToFreezeZ).isSolid())
++ if (world.getMaterial(blockToFreezeX, blockToFreezeY - 1, blockToFreezeZ).isSolid())
+ {
+ world.setBlock(blockToFreezeX, blockToFreezeY, blockToFreezeZ, DefaultMaterial.SNOW.id, 0);
+ }
+diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java
+index 63f205514..b4060afca 100644
+--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java
++++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java
+@@ -1,15 +1,33 @@
+ package com.khorn.terraincontrol.generator.resourcegens;
+
+ import com.khorn.terraincontrol.LocalWorld;
+-import com.khorn.terraincontrol.configuration.BiomeConfig;
+ import com.khorn.terraincontrol.configuration.Resource;
++import com.khorn.terraincontrol.exception.InvalidResourceException;
- private YarnException logAndWrapException(Exception exception, String user,
-- String argName, String msg) throws YarnException {
-+ String operation, String msg) throws YarnException {
- LOG.warn(""Exception "" + msg, exception);
-- RMAuditLogger.logFailure(user, argName, """",
-+ RMAuditLogger.logFailure(user, operation, """",
- ""AdminService"", ""Exception "" + msg);
- return RPCUtil.getRemoteException(exception);
- }
++import java.util.List;
+ import java.util.Random;
-+ private void checkAndThrowIfDistributedNodeLabelConfEnabled(String operation)
-+ throws YarnException {
-+ if (isDistributedNodeLabelConfiguration) {
-+ String msg =
-+ String.format(""Error when invoke method=%s because of ""
-+ + ""distributed node label configuration enabled."", operation);
-+ LOG.error(msg);
-+ throw RPCUtil.getRemoteException(new IOException(msg));
+-public class AboveWaterGen extends ResourceGenBase
++public class AboveWaterGen extends Resource
+ {
++ private int blockId;
++ private int blockData;
++
+ @Override
+- protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
++ public void load(List args) throws InvalidResourceException
++ {
++ if (args.size() < 3)
++ {
++ throw new InvalidResourceException(""Too few arguments supplied"");
++ }
++
++ blockId = getBlockId(args.get(0));
++ blockData = getBlockData(args.get(0));
++ frequency = getInt(args.get(1), 1, 100);
++ rarity = getInt(args.get(2), 1, 100);
+ }
-+ }
+
- @Override
- public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
- CheckForDecommissioningNodesRequest checkForDecommissioningNodesRequest)
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
-index 5e2dc7e4f2543..16b6a890ac923 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
-@@ -104,7 +104,7 @@ public class ResourceTrackerService extends AbstractService implements
- private int minAllocMb;
- private int minAllocVcores;
++ @Override
++ public void spawn(LocalWorld world, Random rand, int x, int z)
+ {
+ int y = world.getLiquidHeight(x, z);
+ if (y == -1)
+@@ -19,26 +37,23 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
+ for (int i = 0; i < 10; i++)
+ {
+ int j = x + rand.nextInt(8) - rand.nextInt(8);
+- //int k = y + rand.nextInt(4) - rand.nextInt(4);
+ int m = z + rand.nextInt(8) - rand.nextInt(8);
+ if (!world.isEmpty(j, y, m) || !world.getMaterial(j, y - 1, m).isLiquid())
+ continue;
+- world.setBlock(j, y, m, res.BlockId, 0, false, false, false);
++ world.setBlock(j, y, m, blockId, blockData, false, false, false);
+ }
+ }
-- private boolean isDistributesNodeLabelsConf;
-+ private boolean isDistributedNodeLabelsConf;
+ @Override
+- protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
++ public ResourceType getType()
+ {
+- res.BlockId = CheckBlock(Props[0]);
+- res.Frequency = CheckValue(Props[1], 1, 100);
+- res.Rarity = CheckValue(Props[2], 0, 100);
+- return true;
++ return ResourceType.biomeConfigResource;
+ }
- static {
- resync.setNodeAction(NodeAction.RESYNC);
-@@ -155,13 +155,8 @@ protected void serviceInit(Configuration conf) throws Exception {
- YarnConfiguration.RM_NODEMANAGER_MINIMUM_VERSION,
- YarnConfiguration.DEFAULT_RM_NODEMANAGER_MINIMUM_VERSION);
+ @Override
+- protected String WriteString(Resource res, String blockSources)
++ public String makeString()
+ {
+- return res.BlockIdToName(res.BlockId) + "","" + res.Frequency + "","" + res.Rarity;
++ return ""AboveWaterGen("" + makeMaterial(blockId) + "","" + frequency + "","" + rarity + "")"";
+ }
++
+ }
+diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java
+index 9e530c630..f0f1f2cfa 100644
+--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java
++++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java
+@@ -1,17 +1,26 @@
+ package com.khorn.terraincontrol.generator.resourcegens;
-- String nodeLabelConfigurationType =
-- conf.get(YarnConfiguration.NODELABEL_CONFIGURATION_TYPE,
-- YarnConfiguration.DEFAULT_NODELABEL_CONFIGURATION_TYPE);
+-import com.khorn.terraincontrol.configuration.BiomeConfig;
+-import com.khorn.terraincontrol.configuration.Resource;
+-import com.khorn.terraincontrol.LocalWorld;
-
-- isDistributesNodeLabelsConf =
-- YarnConfiguration.DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE
-- .equals(nodeLabelConfigurationType);
-+ isDistributedNodeLabelsConf =
-+ YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
-
- super.serviceInit(conf);
- }
-@@ -352,7 +347,7 @@ public RegisterNodeManagerResponse registerNodeManager(
++import java.util.ArrayList;
++import java.util.List;
+ import java.util.Random;
- // Update node's labels to RM's NodeLabelManager.
- Set nodeLabels = request.getNodeLabels();
-- if (isDistributesNodeLabelsConf && nodeLabels != null) {
-+ if (isDistributedNodeLabelsConf && nodeLabels != null) {
- try {
- updateNodeLabelsFromNMReport(nodeLabels, nodeId);
- response.setAreNodeLabelsAcceptedByRM(true);
-@@ -470,7 +465,7 @@ public NodeHeartbeatResponse nodeHeartbeat(NodeHeartbeatRequest request)
- this.rmContext.getDispatcher().getEventHandler().handle(nodeStatusEvent);
+-public class CactusGen extends ResourceGenBase
++import com.khorn.terraincontrol.LocalWorld;
++import com.khorn.terraincontrol.TerrainControl;
++import com.khorn.terraincontrol.configuration.Resource;
++import com.khorn.terraincontrol.exception.InvalidResourceException;
++
++public class CactusGen extends Resource
+ {
++ private int blockId;
++ private int blockData;
++ private int minAltitude;
++ private int maxAltitude;
++ private List sourceBlocks;
++
+ @Override
+- protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
++ public void spawn(LocalWorld world, Random rand, int x, int z)
+ {
+- int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
++ int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
- // 5. Update node's labels to RM's NodeLabelManager.
-- if (isDistributesNodeLabelsConf && request.getNodeLabels() != null) {
-+ if (isDistributedNodeLabelsConf && request.getNodeLabels() != null) {
- try {
- updateNodeLabelsFromNMReport(request.getNodeLabels(), nodeId);
- nodeHeartBeatResponse.setAreNodeLabelsAcceptedByRM(true);
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
-index 6cd6d56281f66..9aea62d1c8408 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
-@@ -149,6 +149,7 @@
- import org.apache.hadoop.yarn.webapp.NotFoundException;
- import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+ for (int i = 0; i < 10; i++)
+ {
+@@ -24,9 +33,9 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
+ for (int i1 = 0; i1 < n; i1++)
+ {
+ int id = world.getTypeId(j, k + i1 - 1, m);
+- if (res.CheckSourceId(id) || id == res.BlockId)
++ if (sourceBlocks.contains(id))
+ {
+- world.setBlock(j, k + i1, m, res.BlockId, 0, false, false, false);
++ world.setBlock(j, k + i1, m, blockId, blockData, false, false, false);
+ }
+ }
+ }
+@@ -34,39 +43,35 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
+ }
-+import com.google.common.annotations.VisibleForTesting;
- import com.google.inject.Inject;
- import com.google.inject.Singleton;
+ @Override
+- protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
++ public ResourceType getType()
+ {
++ return ResourceType.biomeConfigResource;
++ }
-@@ -165,6 +166,9 @@ public class RMWebServices {
- private final Configuration conf;
- private @Context HttpServletResponse response;
+- if (Props[0].contains("".""))
+- {
+- String[] block = Props[0].split(""\\."");
+- res.BlockId = CheckBlock(block[0]);
+- res.BlockData = CheckValue(block[1], 0, 16);
+- } else
+- {
+- res.BlockId = CheckBlock(Props[0]);
+- }
+-
+- res.Frequency = CheckValue(Props[1], 1, 100);
+- res.Rarity = CheckValue(Props[2], 0, 100);
+- res.MinAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight);
+- res.MaxAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
+-
+- res.SourceBlockId = new int[Props.length - 5];
+- for (int i = 5; i < Props.length; i++)
+- res.SourceBlockId[i - 5] = CheckBlock(Props[i]);
+-
+- return true;
++ @Override
++ public String makeString()
++ {
++ return ""Cactus("" + makeMaterial(blockId, blockData) + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + makeMaterial(sourceBlocks);
+ }
-+ @VisibleForTesting
-+ boolean isDistributedNodeLabelConfiguration = false;
+ @Override
+- protected String WriteString(Resource res, String blockSources)
++ public void load(List args) throws InvalidResourceException
+ {
+- String blockId = res.BlockIdToName(res.BlockId);
+- if (res.BlockData > 0)
++ if (args.size() < 6)
++ {
++ throw new InvalidResourceException(""Too few arguments supplied"");
++ }
+
- public final static String DELEGATION_TOKEN_HEADER =
- ""Hadoop-YARN-RM-Delegation-Token"";
-
-@@ -172,6 +176,19 @@ public class RMWebServices {
- public RMWebServices(final ResourceManager rm, Configuration conf) {
- this.rm = rm;
- this.conf = conf;
-+ isDistributedNodeLabelConfiguration =
-+ YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
-+ }
++ blockId = getBlockId(args.get(0));
++ blockData = getBlockData(args.get(0));
++ frequency = getInt(args.get(1), 1, 100);
++ rarity = getInt(args.get(2), 1, 100);
++ minAltitude = getInt(args.get(3), TerrainControl.worldDepth, TerrainControl.worldHeight);
++ maxAltitude = getInt(args.get(4), minAltitude + 1, TerrainControl.worldHeight);
++ sourceBlocks = new ArrayList();
++ for (int i = 5; i < args.size(); i++)
+ {
+- blockId += ""."" + res.BlockData;
++ sourceBlocks.add(getBlockId(args.get(i)));
+ }
+- return blockId + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude + blockSources;
+ }
+ }
+\ No newline at end of file
+diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/CustomObjectGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/CustomObjectGen.java
+new file mode 100644
+index 000000000..a4a943e57
+--- /dev/null
++++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/CustomObjectGen.java
+@@ -0,0 +1,67 @@
++package com.khorn.terraincontrol.generator.resourcegens;
+
-+ private void checkAndThrowIfDistributedNodeLabelConfEnabled(String operation)
-+ throws IOException {
-+ if (isDistributedNodeLabelConfiguration) {
-+ String msg =
-+ String.format(""Error when invoke method=%s because of ""
-+ + ""distributed node label configuration enabled."", operation);
-+ LOG.error(msg);
-+ throw new IOException(msg);
-+ }
- }
-
- RMWebServices(ResourceManager rm, Configuration conf,
-@@ -816,38 +833,64 @@ public LabelsToNodesInfo getLabelsToNodes(
- @POST
- @Path(""/replace-node-to-labels"")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-- public Response replaceLabelsOnNodes(
-- final NodeToLabelsInfo newNodeToLabels,
-- @Context HttpServletRequest hsr)
-- throws IOException {
-+ public Response replaceLabelsOnNodes(final NodeToLabelsInfo newNodeToLabels,
-+ @Context HttpServletRequest hsr) throws IOException {
-+ Map> nodeIdToLabels =
-+ new HashMap>();
++import java.util.ArrayList;
++import java.util.List;
++import java.util.Random;
+
-+ for (Map.Entry nitle : newNodeToLabels
-+ .getNodeToLabels().entrySet()) {
-+ nodeIdToLabels.put(
-+ ConverterUtils.toNodeIdWithDefaultPort(nitle.getKey()),
-+ new HashSet(nitle.getValue().getNodeLabels()));
++import com.khorn.terraincontrol.LocalWorld;
++import com.khorn.terraincontrol.TerrainControl;
++import com.khorn.terraincontrol.configuration.Resource;
++import com.khorn.terraincontrol.customobjects.CustomObject;
++import com.khorn.terraincontrol.exception.InvalidResourceException;
++import com.khorn.terraincontrol.util.Txt;
++
++public class CustomObjectGen extends Resource
++{
++ private List objects;
++ private List objectNames;
++
++ @Override
++ public void load(List args) throws InvalidResourceException
++ {
++ if (args.size() == 0)
++ {
++ // Backwards compability
++ args.add(""UseWorld"");
++ }
++ objects = new ArrayList();
++ for (String arg : args)
++ {
++ CustomObject object = TerrainControl.getCustomObjectManager().getObjectFromString(arg, worldConfig);
++ if (object == null || !object.canSpawnAsObject())
++ {
++ throw new InvalidResourceException(""No custom object found with the name "" + arg);
++ }
++ objects.add(object);
++ objectNames.add(arg);
++ }
+ }
+
-+ return replaceLabelsOnNode(nodeIdToLabels, hsr, ""/replace-node-to-labels"");
-+ }
++ @Override
++ public void spawn(LocalWorld world, Random random, int x, int z)
++ {
++ // Left blank, as process(..) already handles this.
++ }
+
-+ @POST
-+ @Path(""/nodes/{nodeId}/replace-labels"")
-+ @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-+ public Response replaceLabelsOnNode(NodeLabelsInfo newNodeLabelsInfo,
-+ @Context HttpServletRequest hsr, @PathParam(""nodeId"") String nodeId)
-+ throws Exception {
-+ NodeId nid = ConverterUtils.toNodeIdWithDefaultPort(nodeId);
-+ Map> newLabelsForNode =
-+ new HashMap>();
-+ newLabelsForNode.put(nid,
-+ new HashSet(newNodeLabelsInfo.getNodeLabels()));
++ @Override
++ public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ for (CustomObject object : objects)
++ {
++ object.process(world, random, chunkX, chunkZ);
++ }
++ }
+
-+ return replaceLabelsOnNode(newLabelsForNode, hsr, ""/nodes/nodeid/replace-labels"");
-+ }
++ @Override
++ public ResourceType getType()
++ {
++ return ResourceType.biomeConfigResource;
++ }
+
-+ private Response replaceLabelsOnNode(
-+ Map> newLabelsForNode, HttpServletRequest hsr,
-+ String operation) throws IOException {
- init();
--
++ @Override
++ public String makeString()
++ {
++ return ""CustomObject("" + Txt.implode(objectNames, "","") + "")"";
++ }
+
-+ checkAndThrowIfDistributedNodeLabelConfEnabled(""replaceLabelsOnNode"");
++}
+diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java
+index 630d447df..3d7b16d6a 100644
+--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java
++++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java
+@@ -1,34 +1,47 @@
+ package com.khorn.terraincontrol.generator.resourcegens;
+
+-import com.khorn.terraincontrol.configuration.BiomeConfig;
+ import com.khorn.terraincontrol.configuration.Resource;
++import com.khorn.terraincontrol.exception.InvalidResourceException;
+ import com.khorn.terraincontrol.LocalWorld;
++import com.khorn.terraincontrol.TerrainControl;
+
++import java.util.List;
+ import java.util.Random;
+
+-public class DungeonGen extends ResourceGenBase
++public class DungeonGen extends Resource
+ {
++ private int minAltitude;
++ private int maxAltitude;
+
- UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
- if (callerUGI == null) {
-- String msg = ""Unable to obtain user name, user not authenticated for""
-- + "" post to .../replace-node-to-labels"";
-+ String msg =
-+ ""Unable to obtain user name, user not authenticated for""
-+ + "" post to ..."" + operation;
- throw new AuthorizationException(msg);
+ @Override
+- protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
++ public void load(List args) throws InvalidResourceException
+ {
+- int _y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+- world.PlaceDungeons(rand, x, _y, z);
++ if (args.size() < 4)
++ {
++ throw new InvalidResourceException(""Too few arguments supplied"");
++ }
++ frequency = getInt(args.get(0), 1, 100);
++ rarity = getInt(args.get(1), 1, 100);
++ minAltitude = getInt(args.get(2), TerrainControl.worldDepth, TerrainControl.worldHeight);
++ maxAltitude = getInt(args.get(3), minAltitude + 1, TerrainControl.worldHeight);
}
-+
- if (!rm.getRMContext().getNodeLabelManager().checkAccess(callerUGI)) {
-- String msg = ""User "" + callerUGI.getShortUserName() + "" not authorized""
-- + "" for post to .../replace-node-to-labels "";
-+ String msg =
-+ ""User "" + callerUGI.getShortUserName() + "" not authorized""
-+ + "" for post to ..."" + operation;
- throw new AuthorizationException(msg);
+
+ @Override
+- protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
++ public void spawn(LocalWorld world, Random random, int x, int z)
+ {
+- res.Frequency = CheckValue(Props[0], 1, 100);
+- res.Rarity = CheckValue(Props[1], 0, 100);
+- res.MinAltitude = CheckValue(Props[2], 0, biomeConfig.worldConfig.WorldHeight);
+- res.MaxAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
++ int y = random.nextInt(maxAltitude - minAltitude) + minAltitude;
++ world.PlaceDungeons(random, x, y, z);
++ }
+
+- return true;
++ @Override
++ public ResourceType getType()
++ {
++ return ResourceType.biomeConfigResource;
}
--
-- Map> nodeIdToLabels =
-- new HashMap>();
-- for (Map.Entry nitle :
-- newNodeToLabels.getNodeToLabels().entrySet()) {
-- nodeIdToLabels.put(ConverterUtils.toNodeIdWithDefaultPort(nitle.getKey()),
-- new HashSet(nitle.getValue().getNodeLabels()));
-- }
--
-- rm.getRMContext().getNodeLabelManager().replaceLabelsOnNode(nodeIdToLabels);
-+ rm.getRMContext().getNodeLabelManager()
-+ .replaceLabelsOnNode(newLabelsForNode);
+ @Override
+- protected String WriteString(Resource res, String blockSources)
++ public String makeString()
+ {
+- return res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude;
++ return ""Dungeon("" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + "")"";
+ }
+ }
+\ No newline at end of file
+diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java
+index 0bed67e32..79c895dcc 100644
+--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java
++++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java
+@@ -1,60 +1,74 @@
+ package com.khorn.terraincontrol.generator.resourcegens;
+
+-import com.khorn.terraincontrol.configuration.BiomeConfig;
+ import com.khorn.terraincontrol.configuration.Resource;
++import com.khorn.terraincontrol.exception.InvalidResourceException;
+ import com.khorn.terraincontrol.DefaultMaterial;
+ import com.khorn.terraincontrol.LocalWorld;
- return Response.status(Status.OK).build();
- }
--
++import java.util.ArrayList;
++import java.util.List;
+ import java.util.Random;
+
+-public class GrassGen extends ResourceGenBase
++public class GrassGen extends Resource
+ {
++ private int blockId;
++ private int blockData;
++ private List sourceBlocks;
+
- @GET
- @Path(""/get-node-labels"")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-@@ -897,7 +940,7 @@ public Response removeFromCluserNodeLabels(final NodeLabelsInfo oldNodeLabels,
- @Context HttpServletRequest hsr)
- throws Exception {
- init();
--
++ @Override
++ public void load(List args) throws InvalidResourceException
++ {
++ if (args.size() < 5)
++ {
++ throw new InvalidResourceException(""Too few arguments supplied"");
++ }
++ blockId = getBlockId(args.get(0));
++ blockData = getInt(args.get(1), 0, 16);
++ frequency = getInt(args.get(2), 1, 500);
++ rarity = getInt(args.get(3), 1, 100);
++ sourceBlocks = new ArrayList();
++ for (int i = 4; i < args.size(); i++)
++ {
++ sourceBlocks.add(getBlockId(args.get(i)));
++ }
++ }
+
- UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
- if (callerUGI == null) {
- String msg = ""Unable to obtain user name, user not authenticated for""
-@@ -931,40 +974,6 @@ public NodeLabelsInfo getLabelsOnNode(@Context HttpServletRequest hsr,
- rm.getRMContext().getNodeLabelManager().getLabelsOnNode(nid));
+ @Override
+- public void Process(LocalWorld world, Random rand, Resource res, int _x, int _z)
++ public void spawn(LocalWorld world, Random random, int x, int z)
+ {
++ // Handled by process().
++ }
- }
--
-- @POST
-- @Path(""/nodes/{nodeId}/replace-labels"")
-- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-- public Response replaceLabelsOnNode(NodeLabelsInfo newNodeLabelsInfo,
-- @Context HttpServletRequest hsr, @PathParam(""nodeId"") String nodeId)
-- throws Exception {
-- init();
--
-- UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
-- if (callerUGI == null) {
-- String msg = ""Unable to obtain user name, user not authenticated for""
-- + "" post to .../nodes/nodeid/replace-labels"";
-- throw new AuthorizationException(msg);
-- }
--
-- if (!rm.getRMContext().getNodeLabelManager().checkAccess(callerUGI)) {
-- String msg = ""User "" + callerUGI.getShortUserName() + "" not authorized""
-- + "" for post to .../nodes/nodeid/replace-labels"";
-- throw new AuthorizationException(msg);
+- for (int t = 0; t < res.Frequency; t++)
++ @Override
++ public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
++ {
++ for (int t = 0; t < frequency; t++)
+ {
+- if (rand.nextInt(100) >= res.Rarity)
++ if (random.nextInt(100) >= rarity)
+ continue;
+- int x = _x + rand.nextInt(16) + 8;
+- int y = world.getHeight();
+- int z = _z + rand.nextInt(16) + 8;
++ int x = chunkX * 16 + random.nextInt(16) + 8;
++ int z = chunkZ * 16 + random.nextInt(16) + 8;
++ int y = world.getHighestBlockYAt(x, z);
+
+ int i;
+ while ((((i = world.getTypeId(x, y, z)) == 0) || (i == DefaultMaterial.LEAVES.id)) && (y > 0))
+ y--;
+
+- if ((!world.isEmpty(x, y + 1, z)) || (!res.CheckSourceId(world.getTypeId(x, y, z))))
++ if ((!world.isEmpty(x, y + 1, z)) || (!sourceBlocks.contains(world.getTypeId(x, y, z))))
+ continue;
+- world.setBlock(x, y + 1, z, res.BlockId, res.BlockData, false, false, false);
++ world.setBlock(x, y + 1, z, blockId, blockData, false, false, false);
+ }
+ }
+
+ @Override
+- protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
++ public ResourceType getType()
+ {
+-
- }
--
-- NodeId nid = ConverterUtils.toNodeIdWithDefaultPort(nodeId);
--
-- Map> newLabelsForNode = new HashMap>();
--
-- newLabelsForNode.put(nid, new HashSet(newNodeLabelsInfo.getNodeLabels()));
--
-- rm.getRMContext().getNodeLabelManager().replaceLabelsOnNode(newLabelsForNode);
--
-- return Response.status(Status.OK).build();
-
-- }
+- @Override
+- protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+- {
+- res.BlockId = CheckBlock(Props[0]);
+- res.BlockData = CheckValue(Props[1], 0, 16);
+- res.Frequency = CheckValue(Props[2], 1, 500);
+- res.Rarity = CheckValue(Props[3], 0, 100);
+-
+- res.SourceBlockId = new int[Props.length - 4];
+- for (int i = 4; i < Props.length; i++)
+- res.SourceBlockId[i - 4] = CheckBlock(Props[i]);
+-
+- return true;
++ return ResourceType.biomeConfigResource;
+ }
- protected Response killApp(RMApp app, UserGroupInformation callerUGI,
- HttpServletRequest hsr) throws IOException, InterruptedException {
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
-index da04c9ec32b11..fe0b8a8d1ff35 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
-@@ -18,6 +18,7 @@
+ @Override
+- protected String WriteString(Resource res, String blockSources)
++ public String makeString()
+ {
+- return res.BlockIdToName(res.BlockId) + "","" + res.BlockData + "","" + res.Frequency + "","" + res.Rarity + blockSources;
++ return ""Grass("" + makeMaterial(blockId) + "","" + blockData + "","" + frequency + "","" + rarity + makeMaterial(sourceBlocks) + "")"";
+ }
+ }
+\ No newline at end of file
+diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java
+index 00a6cb9f7..1688c7584 100644
+--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java
++++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java
+@@ -1,85 +1,97 @@
+ package com.khorn.terraincontrol.generator.resourcegens;
- package org.apache.hadoop.yarn.server.resourcemanager;
+ import com.khorn.terraincontrol.LocalWorld;
++import com.khorn.terraincontrol.TerrainControl;
-+import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.fail;
+-import com.khorn.terraincontrol.configuration.BiomeConfig;
+ import com.khorn.terraincontrol.configuration.Resource;
++import com.khorn.terraincontrol.exception.InvalidResourceException;
- import java.io.DataOutputStream;
-@@ -44,6 +45,7 @@
- import org.apache.hadoop.security.authorize.ProxyUsers;
- import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
- import org.apache.hadoop.yarn.api.records.DecommissionType;
-+import org.apache.hadoop.yarn.api.records.NodeId;
- import org.apache.hadoop.yarn.conf.HAUtil;
- import org.apache.hadoop.yarn.conf.YarnConfiguration;
- import org.apache.hadoop.yarn.exceptions.YarnException;
-@@ -53,6 +55,9 @@
- import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
- import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
- import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
-+import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
-+import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
-+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
- import org.junit.After;
-@@ -60,6 +65,8 @@
- import org.junit.Before;
- import org.junit.Test;
++import java.util.ArrayList;
++import java.util.List;
+ import java.util.Random;
-+import com.google.common.collect.ImmutableMap;
-+import com.google.common.collect.ImmutableSet;
+-public class LiquidGen extends ResourceGenBase
++public class LiquidGen extends Resource
+ {
++ private int blockId;
++ private int blockData;
++ private List sourceBlocks;
++ private int minAltitude;
++ private int maxAltitude;
++
+ @Override
+- protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
++ public void spawn(LocalWorld world, Random rand, int x, int z)
+ {
+- int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
++ int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
- public class TestRMAdminService {
+- if (res.CheckSourceId(world.getTypeId(x, y + 1, z)))
++ if (sourceBlocks.contains(world.getTypeId(x, y + 1, z)))
+ return;
+- if (res.CheckSourceId(world.getTypeId(x, y - 1, z)))
++ if (sourceBlocks.contains(world.getTypeId(x, y - 1, z)))
+ return;
-@@ -754,6 +761,67 @@ public void testRMInitialsWithFileSystemBasedConfigurationProvider()
- }
- }
+- if ((world.getTypeId(x, y, z) != 0) && (res.CheckSourceId(world.getTypeId(x, y, z))))
++ if ((world.getTypeId(x, y, z) != 0) && (sourceBlocks.contains(world.getTypeId(x, y, z))))
+ return;
-+ @Test
-+ public void testModifyLabelsOnNodesWithDistributedConfigurationDisabled()
-+ throws IOException, YarnException {
-+ // create RM and set it's ACTIVE
-+ MockRM rm = new MockRM();
-+ ((RMContextImpl) rm.getRMContext())
-+ .setHAServiceState(HAServiceState.ACTIVE);
-+ RMNodeLabelsManager labelMgr = rm.rmContext.getNodeLabelManager();
-+
-+ // by default, distributed configuration for node label is disabled, this
-+ // should pass
-+ labelMgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of(""x"", ""y""));
-+ rm.adminService.replaceLabelsOnNode(ReplaceLabelsOnNodeRequest
-+ .newInstance(ImmutableMap.of(NodeId.newInstance(""host"", 0),
-+ (Set) ImmutableSet.of(""x""))));
-+ rm.close();
-+ }
-+
-+ @Test(expected = YarnException.class)
-+ public void testModifyLabelsOnNodesWithDistributedConfigurationEnabled()
-+ throws IOException, YarnException {
-+ // create RM and set it's ACTIVE, and set distributed node label
-+ // configuration to true
-+ MockRM rm = new MockRM();
-+ rm.adminService.isDistributedNodeLabelConfiguration = true;
-+
-+ ((RMContextImpl) rm.getRMContext())
-+ .setHAServiceState(HAServiceState.ACTIVE);
-+ RMNodeLabelsManager labelMgr = rm.rmContext.getNodeLabelManager();
-+
-+ // by default, distributed configuration for node label is disabled, this
-+ // should pass
-+ labelMgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of(""x"", ""y""));
-+ rm.adminService.replaceLabelsOnNode(ReplaceLabelsOnNodeRequest
-+ .newInstance(ImmutableMap.of(NodeId.newInstance(""host"", 0),
-+ (Set) ImmutableSet.of(""x""))));
-+ rm.close();
-+ }
-+
-+ @Test
-+ public void testRemoveClusterNodeLabelsWithDistributedConfigurationEnabled()
-+ throws IOException, YarnException {
-+ // create RM and set it's ACTIVE
-+ MockRM rm = new MockRM();
-+ ((RMContextImpl) rm.getRMContext())
-+ .setHAServiceState(HAServiceState.ACTIVE);
-+ RMNodeLabelsManager labelMgr = rm.rmContext.getNodeLabelManager();
-+ rm.adminService.isDistributedNodeLabelConfiguration = true;
-+
-+ // by default, distributed configuration for node label is disabled, this
-+ // should pass
-+ labelMgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of(""x"", ""y""));
-+ rm.adminService
-+ .removeFromClusterNodeLabels(RemoveFromClusterNodeLabelsRequest
-+ .newInstance((Set) ImmutableSet.of(""x"")));
-+
-+ Set clusterNodeLabels = labelMgr.getClusterNodeLabelNames();
-+ assertEquals(1,clusterNodeLabels.size());
-+ rm.close();
-+ }
-+
- private String writeConfigurationXML(Configuration conf, String confXMLName)
- throws IOException {
- DataOutputStream output = null;
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java
-index 9548029d08769..2e21d261f615f 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java
-@@ -40,7 +40,8 @@ public void initNodeLabelStore(Configuration conf) {
- this.store = new NodeLabelsStore(this) {
+-
+ int i = 0;
+ int j = 0;
- @Override
-- public void recover() throws IOException {
-+ public void recover(boolean ignoreNodeToLabelsMappings)
-+ throws IOException {
- // do nothing
- }
+ int tempBlock = world.getTypeId(x - 1, y, z);
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
-index 298246ca301e2..e4614f8c9ec7e 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
-@@ -51,6 +51,7 @@
- import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
- import org.apache.hadoop.yarn.server.resourcemanager.RMContextImpl;
- import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
-+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
-@@ -623,6 +624,7 @@ public void testAppsRace() throws Exception {
- null, null, null, null, null);
- when(mockRM.getRMContext()).thenReturn(rmContext);
- when(mockRM.getClientRMService()).thenReturn(mockClientSvc);
-+ rmContext.setNodeLabelManager(mock(RMNodeLabelsManager.class));
+- i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
++ i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
+ j = (tempBlock == 0) ? j + 1 : j;
- RMWebServices webSvc = new RMWebServices(mockRM, new Configuration(),
- mock(HttpServletResponse.class));
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
-index 40c54a30a6a8d..2d5518dc03cf8 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
-@@ -19,10 +19,10 @@
- package org.apache.hadoop.yarn.server.resourcemanager.webapp;
+ tempBlock = world.getTypeId(x + 1, y, z);
- import static org.junit.Assert.assertEquals;
-+import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertTrue;
+- i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
++ i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
+ j = (tempBlock == 0) ? j + 1 : j;
- import java.io.IOException;
--import java.io.StringReader;
- import java.io.StringWriter;
+ tempBlock = world.getTypeId(x, y, z - 1);
- import javax.ws.rs.core.MediaType;
-@@ -51,7 +51,6 @@
- import com.sun.jersey.api.client.WebResource;
- import com.sun.jersey.api.json.JSONJAXBContext;
- import com.sun.jersey.api.json.JSONMarshaller;
--import com.sun.jersey.api.json.JSONUnmarshaller;
- import com.sun.jersey.core.util.MultivaluedMapImpl;
- import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
- import com.sun.jersey.test.framework.WebAppDescriptor;
-@@ -66,13 +65,13 @@ public class TestRMWebServicesNodeLabels extends JerseyTestBase {
+- i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
++ i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
+ j = (tempBlock == 0) ? j + 1 : j;
- private String userName;
- private String notUserName;
-+ private RMWebServices rmWebService;
+ tempBlock = world.getTypeId(x, y, z + 1);
+
+- i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
++ i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
+ j = (tempBlock == 0) ? j + 1 : j;
+
+-
+ if ((i == 3) && (j == 1))
+ {
+- world.setBlock(x, y, z, res.BlockId, 0, true, true, true);
+- //this.world.f = true;
+- //Block.byId[res.BlockId].a(this.world, x, y, z, this.rand);
+- //this.world.f = false;
++ world.setBlock(x, y, z, blockId, 0, true, true, true);
++ // this.world.f = true;
++ // Block.byId[res.BlockId].a(this.world, x, y, z, this.rand);
++ // this.world.f = false;
+ }
+ }
- private Injector injector = Guice.createInjector(new ServletModule() {
-+
@Override
- protected void configureServlets() {
- bind(JAXBContextResolver.class);
-- bind(RMWebServices.class);
-- bind(GenericExceptionHandler.class);
- try {
- userName = UserGroupInformation.getCurrentUser().getShortUserName();
- } catch (IOException ioe) {
-@@ -83,6 +82,9 @@ protected void configureServlets() {
- conf = new YarnConfiguration();
- conf.set(YarnConfiguration.YARN_ADMIN_ACL, userName);
- rm = new MockRM(conf);
-+ rmWebService = new RMWebServices(rm,conf);
-+ bind(RMWebServices.class).toInstance(rmWebService);
-+ bind(GenericExceptionHandler.class);
- bind(ResourceManager.class).toInstance(rm);
- filter(""/*"").through(
- TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class);
-@@ -113,7 +115,6 @@ public void testNodeLabels() throws JSONException, Exception {
- ClientResponse response;
- JSONObject json;
- JSONArray jarr;
-- String responseString;
+- protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
++ public void load(List