almost looks like progress, but not really

kabir · Sep 25, 2012 · 6521fd3 · 6521fd3
1 parent f5d5f18
commit 6521fd3
Show file tree

Hide file tree

Showing 25 changed files with 482 additions and 288 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -11,4 +11,11 @@
     </parent>
 
     <artifactId>jboss-mgmt-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.msc</groupId>
+            <artifactId>jboss-msc2</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/api/src/main/java/org/jboss/mgmt/AbstractResource.java b/api/src/main/java/org/jboss/mgmt/AbstractResource.java
@@ -23,15 +23,17 @@
 package org.jboss.mgmt;
 
 /**
+ * Base class for resource data objects.
+ *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
 public abstract class AbstractResource implements Resource {
     private final String preComment;
     private final String postComment;
     private final String name;
-    private final Resource parent;
+    private final ResourceNode<?> parent;
 
-    protected AbstractResource(final String preComment, final String postComment, final String name, final Resource parent) {
+    protected AbstractResource(final String preComment, final String postComment, final String name, final ResourceNode<?> parent) {
         this.preComment = preComment;
         this.postComment = postComment;
         this.name = name;

diff --git a/...ava/org/jboss/mgmt/BuilderMapBuilder.java → ...g/jboss/mgmt/AbstractResourceBuilder.java b/...ava/org/jboss/mgmt/BuilderMapBuilder.java → ...g/jboss/mgmt/AbstractResourceBuilder.java
@@ -23,12 +23,17 @@
 package org.jboss.mgmt;
 
 /**
- * A builder for attributes of a map type whose values are complex.
+ * Infrastructure class used by generated resource implementations.
  *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
-public interface BuilderMapBuilder<P, K, V extends NestedBuilder<BuilderMapBuilder<P, K, V>>> extends NestedBuilder<P> {
-    V put(K key);
+public abstract class AbstractResourceBuilder<R extends Resource, P extends NestedBuilder<?>, THIS extends AbstractResourceBuilder<R, P, THIS>> implements NestedBuilder<P> {
+    protected final ResourceNode<R> construct(ResourceNode<?> parentNode) {
+        return null;
+    }
 
-    BuilderMapBuilder<P, K, V> remove(K key);
+    @SuppressWarnings("unchecked")
+    protected final THIS _this() {
+        return (THIS) this;
+    }
 }
diff --git a/...rg/jboss/mgmt/ResourceBuilderFactory.java → ...n/java/org/jboss/mgmt/BuilderFactory.java b/...rg/jboss/mgmt/ResourceBuilderFactory.java → ...n/java/org/jboss/mgmt/BuilderFactory.java
@@ -27,6 +27,6 @@
  *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
-public interface ResourceBuilderFactory<P, B extends NestedBuilder<P>> {
+public interface BuilderFactory<P, B extends NestedBuilder<P>> {
     B construct(P parent);
 }
diff --git a/.../jboss/mgmt/BuilderCollectionBuilder.java → api/src/main/java/org/jboss/mgmt/Entry.java b/.../jboss/mgmt/BuilderCollectionBuilder.java → api/src/main/java/org/jboss/mgmt/Entry.java
@@ -22,9 +22,31 @@
 
 package org.jboss.mgmt;
 
+import java.util.Map;
+
 /**
+ * An immutable map entry, used by builder classes.
+ *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
-public interface BuilderCollectionBuilder<P, E extends NestedBuilder<BuilderCollectionBuilder<P, E>>> extends NestedBuilder<P> {
-    E add();
+public final class Entry<K, V> implements Map.Entry<K, V> {
+    private final K key;
+    private final V value;
+
+    Entry(final K key, final V value) {
+        this.value = value;
+        this.key = key;
+    }
+
+    public K getKey() {
+        return key;
+    }
+
+    public V getValue() {
+        return value;
+    }
+
+    public V setValue(final V value) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/...va/org/jboss/mgmt/model/ResourceNode.java → ...ain/java/org/jboss/mgmt/ResourceNode.java b/...va/org/jboss/mgmt/model/ResourceNode.java → ...ain/java/org/jboss/mgmt/ResourceNode.java
@@ -20,19 +20,24 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.jboss.mgmt.model;
+package org.jboss.mgmt;
 
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import org.jboss.msc.txn.WorkContext;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 
 /**
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
-public abstract class ResourceNode<R> {
+public abstract class ResourceNode<R extends Resource> implements Resource {
     private volatile int state;
     private volatile R current;
     private volatile Object owningTxn;
     private volatile Thread waiter;
+    private final ResourceNode<?> parent;
 
     private static final AtomicIntegerFieldUpdater<ResourceNode> stateUpdater = AtomicIntegerFieldUpdater.newUpdater(ResourceNode.class, "state");
     private static final AtomicReferenceFieldUpdater<ResourceNode, Object> currentUpdater = AtomicReferenceFieldUpdater.newUpdater(ResourceNode.class, Object.class, "current");
@@ -43,6 +48,10 @@ public abstract class ResourceNode<R> {
     private static final int INTENT_WRITE_LOCK = (1 << 30);
     private static final int READERS = INTENT_WRITE_LOCK - 1;
 
+    protected ResourceNode(final ResourceNode<?> parent) {
+        this.parent = parent;
+    }
+
     private static Object currentTransaction() {
         return null; // todo once msc-2 stabilizes...
     }
@@ -69,4 +78,33 @@ private void lockRead(final Object txn) {
     private void lockWrite(final Object txn) {
         // set write flag or block with txn
     }
+
+    public String getPreComment() {
+        return current.getPreComment();
+    }
+
+    public String getPostComment() {
+        return current.getPostComment();
+    }
+
+    public String getName() {
+        return current.getName();
+    }
+
+    public Resource getParent() {
+        return parent;
+    }
+
+    public Resource navigate(final String key, final String value) {
+        return null;
+    }
+
+    protected abstract R writeAttribute(WorkContext workContext, String name, Object value);
+
+    protected abstract void persist(XMLStreamWriter writer) throws XMLStreamException;
+
+    @SuppressWarnings("unchecked")
+    R asResource() {
+        return (R) this;
+    }
 }
diff --git a/api/src/main/java/org/jboss/mgmt/SimpleCollectionBuilder.java b/api/src/main/java/org/jboss/mgmt/SimpleCollectionBuilder.java
diff --git a/api/src/main/java/org/jboss/mgmt/SimpleMapBuilder.java b/api/src/main/java/org/jboss/mgmt/SimpleMapBuilder.java
diff --git a/example/src/main/java/example1/DomainResource.java b/example/src/main/java/example1/DomainResource.java
@@ -35,8 +35,9 @@
 @RootResource(
     type = "top",
     namespace = "jboss",
-    version = "1.0",
+    version = "8.0",
     kind = RootResource.Kind.SYSTEM,
+    schemaLocation = "http://www.jboss.org/schema/jbossas/jboss_8_0.xsd",
     compatibilityNamespaces = { "urn:jboss:domain:1.0" }
 )
 public interface DomainResource extends Resource {

diff --git a/example/src/main/java/example1/LoggingSubsystemResource.java b/example/src/main/java/example1/LoggingSubsystemResource.java
@@ -37,7 +37,8 @@
     type = "subsystem",
     name = "logging",
     namespace = "core.logging",
-    version = "1.0"
+    schemaLocation = "http://www.jboss.org/schema/jbossas/jboss-core-logging_8_0.xsd",
+    version = "8.0"
 )
 @XmlName("subsystem")
 public interface LoggingSubsystemResource extends Resource {

diff --git a/example/src/main/java/example1/StandaloneServerResource.java b/example/src/main/java/example1/StandaloneServerResource.java
@@ -24,13 +24,19 @@
 
 import org.jboss.mgmt.annotation.AttributeGroup;
 import org.jboss.mgmt.annotation.RootResource;
-import org.jboss.mgmt.annotation.xml.XmlName;
 
 /**
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
-@RootResource(type = "model", kind = RootResource.Kind.SYSTEM, name = "standalone", version = "1.0", namespace = "jboss")
-@XmlName("standalone")
+@RootResource(
+    name = "server",
+    type = "top",
+    namespace = "jboss",
+    version = "8.0",
+    kind = RootResource.Kind.SYSTEM,
+    schemaLocation = "http://www.jboss.org/schema/jbossas/jboss_8_0.xsd",
+    compatibilityNamespaces = { "urn:jboss:domain:1.0" }
+)
 public interface StandaloneServerResource extends ServerResource {
 
     @AttributeGroup

diff --git a/pom.xml b/pom.xml
@@ -39,8 +39,8 @@
     </parent>
     <properties>
         <version.compiler.plugin>2.5.1</version.compiler.plugin>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.6</maven.compiler.source>
     </properties>
 
 
@@ -57,8 +57,8 @@
                 <version>${version.compiler.plugin}</version>
                 <configuration>
                     <compilerArguments>
-                        <XprintRounds />
-                        <XprintProcessorInfo/>
+                        <!--<XprintRounds />-->
+                        <!--<XprintProcessorInfo/>-->
                     </compilerArguments>
                 </configuration>
             </plugin>
@@ -76,11 +76,11 @@
                 <artifactId>jboss-mgmt-tool</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>org.jboss.msc</groupId>-->
-                <!--<artifactId>jboss-msc2</artifactId>-->
-                <!--<version>2.0.0.Beta1-SNAPSHOT</version>-->
-            <!--</dependency>-->
+            <dependency>
+                <groupId>org.jboss.msc</groupId>
+                <artifactId>jboss-msc2</artifactId>
+                <version>2.0.0.Beta1-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>xom</groupId>
                 <artifactId>xom</artifactId>

diff --git a/tool/pom.xml b/tool/pom.xml
@@ -29,10 +29,10 @@
             <groupId>org.jboss.mgmt</groupId>
             <artifactId>jboss-mgmt-api</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.jboss.msc2</groupId>-->
-            <!--<artifactId>jboss-msc2</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.jboss.msc</groupId>
+            <artifactId>jboss-msc2</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.sun.codemodel</groupId>
             <artifactId>codemodel</artifactId>

diff --git a/tool/src/main/java/org/jboss/mgmt/annotation/AttributeType.java b/tool/src/main/java/org/jboss/mgmt/annotation/AttributeType.java
@@ -29,6 +29,8 @@
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
 /**
+ * Declare a class to be an attribute type.  Attribute types are read and written as one attribute.
+ *
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  */
 @Retention(CLASS)

diff --git a/tool/src/main/java/org/jboss/mgmt/annotation/Description.java b/tool/src/main/java/org/jboss/mgmt/annotation/Description.java
diff --git a/tool/src/main/java/org/jboss/mgmt/annotation/RootResource.java b/tool/src/main/java/org/jboss/mgmt/annotation/RootResource.java
@@ -71,6 +71,13 @@
      */
     String namespace();
 
+    /**
+     * The schema location.  This URL string will be used to determine the target filename of the generated schema.
+     *
+     * @return the URL
+     */
+    String schemaLocation();
+
     /**
      * Compatibility namespaces that should also be recognized (but not generated).
      *