geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r763999 [3/4] - in /geronimo/sandbox/djencks/framework: buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/ buildsupport/car-maven-plugin/src/te...
Date Fri, 10 Apr 2009 18:35:12 GMT
Added: geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,363 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.kernel.config.classloading;
+
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DependencyResolverTest extends TestCase {
+
+    private static final String DOC = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
+            "<geronimo-plugin xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\" xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\">\n" +
+            "    <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</name>\n" +
+            "    <category>Geronimo Core</category>\n" +
+            "    <pluginGroup>false</pluginGroup>\n" +
+            "    <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>\n" +
+            "    <url>http://geronimo.apache.org/</url>\n" +
+            "    <author>The Apache Geronimo development community</author>\n" +
+            "    <license osi-approved=\"true\">The Apache Software License, Version 2.0</license>\n" +
+            "    <plugin-artifact>\n" +
+            "        <module-id>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>car</type>\n" +
+            "        </module-id>\n" +
+            "        <geronimo-version>2.2-SNAPSHOT</geronimo-version>\n" +
+            "        <jvm-version>1.5</jvm-version>\n" +
+            "        <jvm-version>1.6</jvm-version>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-common</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-kernel</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.slf4j</groupId>\n" +
+            "            <artifactId>slf4j-log4j12</artifactId>\n" +
+            "            <version>1.5.5</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>log4j</groupId>\n" +
+            "                <artifactId>log4j</artifactId>\n" +
+            "                <version>1.2.15</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.slf4j</groupId>\n" +
+            "            <artifactId>slf4j-api</artifactId>\n" +
+            "            <version>1.5.5</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>log4j</groupId>\n" +
+            "            <artifactId>log4j</artifactId>\n" +
+            "            <version>1.2.15</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-logging</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>asm</groupId>\n" +
+            "            <artifactId>asm</artifactId>\n" +
+            "            <version>3.1</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>asm</groupId>\n" +
+            "            <artifactId>asm-commons</artifactId>\n" +
+            "            <version>3.1</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>cglib</groupId>\n" +
+            "            <artifactId>cglib-nodep</artifactId>\n" +
+            "            <version>2.1_3</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.xbean</groupId>\n" +
+            "            <artifactId>xbean-reflect</artifactId>\n" +
+            "            <version>3.5-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>com.thoughtworks.xstream</groupId>\n" +
+            "            <artifactId>xstream</artifactId>\n" +
+            "            <version>1.3</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>xpp3</groupId>\n" +
+            "                <artifactId>xpp3_min</artifactId>\n" +
+            "                <version>1.1.4c</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>xpp3</groupId>\n" +
+            "            <artifactId>xpp3_min</artifactId>\n" +
+            "            <version>1.1.4c</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-deployment</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-system</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "                <artifactId>geronimo-cli</artifactId>\n" +
+            "                <version>2.2-SNAPSHOT</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "                <artifactId>geronimo-common</artifactId>\n" +
+            "                <version>2.2-SNAPSHOT</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "                <artifactId>geronimo-crypto</artifactId>\n" +
+            "                <version>2.2-SNAPSHOT</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "                <artifactId>geronimo-kernel</artifactId>\n" +
+            "                <version>2.2-SNAPSHOT</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>commons-jexl</groupId>\n" +
+            "                <artifactId>commons-jexl</artifactId>\n" +
+            "                <version>1.1</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>log4j</groupId>\n" +
+            "                <artifactId>log4j</artifactId>\n" +
+            "                <version>1.2.15</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>javax.xml.bind</groupId>\n" +
+            "                <artifactId>jaxb-api</artifactId>\n" +
+            "                <version>2.1</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.specs</groupId>\n" +
+            "                <artifactId>geronimo-stax-api_1.0_spec</artifactId>\n" +
+            "                <version>1.0.1</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-cli</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "                <artifactId>geronimo-kernel</artifactId>\n" +
+            "                <version>2.2-SNAPSHOT</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>commons-cli</groupId>\n" +
+            "                <artifactId>commons-cli</artifactId>\n" +
+            "                <version>1.0</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>commons-cli</groupId>\n" +
+            "            <artifactId>commons-cli</artifactId>\n" +
+            "            <version>1.0</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-crypto</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>commons-jexl</groupId>\n" +
+            "            <artifactId>commons-jexl</artifactId>\n" +
+            "            <version>1.1</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>javax.xml.bind</groupId>\n" +
+            "            <artifactId>jaxb-api</artifactId>\n" +
+            "            <version>2.1</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.specs</groupId>\n" +
+            "            <artifactId>geronimo-stax-api_1.0_spec</artifactId>\n" +
+            "            <version>1.0.1</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.xmlbeans</groupId>\n" +
+            "            <artifactId>xmlbeans</artifactId>\n" +
+            "            <version>2.3.0</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>xml-resolver</groupId>\n" +
+            "            <artifactId>xml-resolver</artifactId>\n" +
+            "            <version>1.2</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-service-builder</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "                <artifactId>geronimo-deployment</artifactId>\n" +
+            "                <version>2.2-SNAPSHOT</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.xmlbeans</groupId>\n" +
+            "                <artifactId>xmlbeans</artifactId>\n" +
+            "                <version>2.3.0</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.specs</groupId>\n" +
+            "                <artifactId>geronimo-stax-api_1.0_spec</artifactId>\n" +
+            "                <version>1.0.1</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.specs</groupId>\n" +
+            "                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>\n" +
+            "                <version>1.0</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.specs</groupId>\n" +
+            "            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>\n" +
+            "            <version>1.0</version>\n" +
+            "            <type>jar</type>\n" +
+            "        </dependency>\n" +
+            "        <dependency>\n" +
+            "            <groupId>org.apache.geronimo.framework</groupId>\n" +
+            "            <artifactId>geronimo-deploy-config</artifactId>\n" +
+            "            <version>2.2-SNAPSHOT</version>\n" +
+            "            <type>jar</type>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.apache.geronimo.specs</groupId>\n" +
+            "                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>\n" +
+            "                <version>1.0</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "            <dependency xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"dependencyType\">\n" +
+            "                <groupId>org.slf4j</groupId>\n" +
+            "                <artifactId>slf4j-api</artifactId>\n" +
+            "                <version>1.5.5</version>\n" +
+            "                <type>jar</type>\n" +
+            "            </dependency>\n" +
+            "        </dependency>\n" +
+            "        <source-repository>~/.m2/repository/</source-repository>\n" +
+            "        <source-repository>http://repo1.maven.org/maven2/</source-repository>\n" +
+            "        <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>\n" +
+            "        <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>\n" +
+            "        <artifact-alias key=\"org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap//car\">org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/2.2-SNAPSHOT/car</artifact-alias>\n" +
+            "    </plugin-artifact>\n" +
+            "</geronimo-plugin>";
+
+    public void testDoc() throws Exception {
+        MavenDependencyResolver resolver = new MavenDependencyResolver();
+        InputStream in = new StringBufferInputStream(DOC);
+        BasicGlobalClassLoaderRegister register = new BasicGlobalClassLoaderRegister();
+        resolver.addDependencies(register, in);
+        int size = register.graph.size();
+
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java (original)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java Fri Apr 10 18:35:10 2009
@@ -25,6 +25,8 @@
 import java.util.SortedSet;
 import java.util.LinkedHashSet;
 import java.util.TreeSet;
+import java.util.Map;
+import java.util.HashMap;
 import java.io.File;
 
 import org.apache.geronimo.kernel.repository.Artifact;
@@ -37,37 +39,48 @@
  */
 public class MockRepository implements ListableRepository {
 
-    private final Set<Artifact> repo;
+    private final Map<Artifact, File> repo;
 
 
     public MockRepository() {
-        this(new HashSet<Artifact>());
+        this(new HashMap<Artifact, File>());
     }
 
-    public MockRepository(Set<Artifact> repo) {
+    public MockRepository(Map<Artifact, File> repo) {
         this.repo = repo;
     }
 
-    public Set<Artifact> getRepo() {
+    public MockRepository(Set<Artifact> repo) {
+        this.repo = new HashMap<Artifact, File>();
+        for (Artifact artifact: repo) {
+            this.repo.put(artifact, null);
+        }
+    }
+
+    public Map<Artifact, File> getRepo() {
         return repo;
     }
 
     public boolean contains(Artifact artifact) {
-        return repo.contains(artifact);
+        return repo.containsKey(artifact);
     }
 
     public File getLocation(Artifact artifact) {
-        return new File(".");
+        File file = repo.get(artifact);
+        if (file == null) {
+            file = new File(".");
+        }
+        return file;
     }
 
     public SortedSet<Artifact> list() {
-        return new TreeSet<Artifact>(repo);
+        return new TreeSet<Artifact>(repo.keySet());
     }
 
     public SortedSet<Artifact> list(Artifact query) {
         SortedSet<Artifact> set = new TreeSet<Artifact>();
         if (!repo.isEmpty()) {
-            for (Artifact artifact : repo) {
+            for (Artifact artifact : repo.keySet()) {
                 if (query.matches(artifact)) {
                     set.add(artifact);
                 }

Modified: geronimo/sandbox/djencks/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-security/pom.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-security/pom.xml Fri Apr 10 18:35:10 2009
@@ -60,11 +60,11 @@
             <!--<artifactId>geronimo-crypto</artifactId>-->
             <!--<version>${version}</version>-->
         <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-management</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>

Modified: geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java (original)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java Fri Apr 10 18:35:10 2009
@@ -22,6 +22,8 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.jar.JarFile;
 
 import javax.management.ObjectName;
@@ -89,11 +91,13 @@
         try {
 
             Environment environment = EnvironmentBuilder.buildEnvironment(plan.getEnvironment());
-            Set<Artifact> repo = new HashSet<Artifact>();
-            repo.add(Artifact.create("geronimo/foo1/DEV/car"));
-            repo.add(Artifact.create("geronimo/foo2/DEV/car"));
-            repo.add(Artifact.create("geronimo/foo3/DEV/car"));
-            repo.add(Artifact.create("geronimo/foo4/DEV/car"));
+            Map<Artifact, File> repo = new HashMap<Artifact, File>();
+            File file = new File(plan1.getFile());
+            repo.put(Artifact.create("geronimo/foo1/DEV/jar"), file);
+            repo.put(Artifact.create("geronimo/foo2/DEV/jar"), file);
+            repo.put(Artifact.create("geronimo/foo3/DEV/car"), file);
+            repo.put(Artifact.create("geronimo/foo4/DEV/car"), file);
+
             ListableRepository mockRepository = new MockRepository(repo);
             ArtifactManager artifactManager = new DefaultArtifactManager();
             ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, mockRepository);

Copied: geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata (from r761814, geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata?p2=geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata&p1=geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml&r1=761814&r2=763999&rev=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml (original)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata Fri Apr 10 18:35:10 2009
@@ -30,7 +30,7 @@
         <dependencies>
             <dependency>
                 <groupId>geronimo</groupId>
-                <artifactId>foo4</artifactId>
+                <artifactId>foo3</artifactId>
                 <version>DEV</version>
                 <type>car</type>
             </dependency>
@@ -55,23 +55,4 @@
 
         </dependencies>
     </environment>
-    <gbean name="MyMockGMBean" class="org.apache.geronimo.deployment.MockGBean">
-        <attribute name="value">1234</attribute>
-        <attribute name="intValue">1234</attribute>
-        <xml-attribute name="fooBarBean">
-            <ns:javabean xmlns:ns="http://geronimo.apache.org/xml/ns/deployment/javabean-1.0">
-                <ns:property name="Foo">foo</ns:property>
-                <ns:property name="Bar">10</ns:property>
-                <ns:bean-property name="Bean">
-                    <ns:javabean>
-                        <ns:property name="Foo">foo2</ns:property>
-                        <ns:property name="Bar">100</ns:property>
-                    </ns:javabean>
-                </ns:bean-property>
-            </ns:javabean>
-        </xml-attribute>
-        <reference name="MockEndpoint">
-            <name>MyMockGMBean</name>
-        </reference>
-    </gbean>
 </module>

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml (original)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml Fri Apr 10 18:35:10 2009
@@ -30,7 +30,7 @@
         <dependencies>
             <dependency>
                 <groupId>geronimo</groupId>
-                <artifactId>foo4</artifactId>
+                <artifactId>foo3</artifactId>
                 <version>DEV</version>
                 <type>car</type>
             </dependency>

Modified: geronimo/sandbox/djencks/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/pom.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/pom.xml Fri Apr 10 18:35:10 2009
@@ -74,10 +74,11 @@
             <artifactId>log4j</artifactId>
         </dependency>
 
+        <!-- todo move jul logging install gbean to where it's needed such as tomcat and/or jasper plugins -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <!-- plugin management -->
@@ -176,21 +177,21 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xjc</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <packageName>org.apache.geronimo.system.plugin.model</packageName>
-                    <extension>true</extension>
-                </configuration>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo</groupId>-->
+                <!--<artifactId>jaxb2-maven-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>xjc</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+                <!--<configuration>-->
+                    <!--<packageName>org.apache.geronimo.system.plugin.model</packageName>-->
+                    <!--<extension>true</extension>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,218 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 04:38:27 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.geronimo.kernel.repository.Artifact;
+
+
+/**
+ * 
+ *                 
+ *                 Refers to either another module running in the server, or
+ *                 an entry in the server's Repository.  In either case this effectively uses a
+ *                 URI.
+ * 
+ *                 When this is pointing to a repository entry, the URI must have a form
+ *                 acceptable to the repository, which is currently a URI consisting of
+ *                 Maven-style identifiers separated by slashes (groupId/artifactId/version/type,
+ *                 for example, the URI "postgresql/postgresql-8.0-jdbc/313/jar" for a file like
+ *                 "repository/postgresql/postgresql-8.0-jdbc-313.jar").
+ * 
+ *                 When this is pointing to a module, the URI should match the
+ *                 module's moduleId.  This also looks
+ *                 like a Maven-style URI discussed above.
+ * 
+ *                 The artifactType element can take either a straight URI (as in the examples
+ *                 above), or maven-style identifier fragments (groupId, type, artifactId, and
+ *                 version), which it will compose into a URI by adding up the fragments with
+ *                 slashes in between.
+ * 
+ *                 There is a correspondence between the xml format and a URI.  For example, the URI
+ * 
+ *                 postgresql/postgresql-8.0-jdbc/313/jar
+ * 
+ *                 corresponds to the xml:
+ * 
+ *                 <groupId>postgresql</groupId>
+ *                 <artifactId>postgresql-8.0-jdbc</artifactId>
+ *                 <version>313</version>
+ *                 <type>jar</type>
+ * 	            
+ *             
+ * 
+ * <p>Java class for artifactType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="artifactType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="groupId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="artifactId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "artifactType", propOrder = {
+    "groupId",
+    "artifactId",
+    "version",
+    "type"
+})
+public class ArtifactType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    protected String groupId;
+    @XmlElement(required = true)
+    protected String artifactId;
+    protected String version;
+    protected String type;
+
+    /**
+     * Gets the value of the groupId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * Sets the value of the groupId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGroupId(String value) {
+        this.groupId = value;
+    }
+
+    /**
+     * Gets the value of the artifactId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    /**
+     * Sets the value of the artifactId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArtifactId(String value) {
+        this.artifactId = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ArtifactType that = (ArtifactType) o;
+
+        if (artifactId != null ? !artifactId.equals(that.artifactId) : that.artifactId != null) return false;
+        if (groupId != null ? !groupId.equals(that.groupId) : that.groupId != null) return false;
+        if (type != null ? !type.equals(that.type) : that.type != null) return false;
+        if (version != null ? !version.equals(that.version) : that.version != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = groupId != null ? groupId.hashCode() : 0;
+        result = 31 * result + (artifactId != null ? artifactId.hashCode() : 0);
+        result = 31 * result + (version != null ? version.hashCode() : 0);
+        result = 31 * result + (type != null ? type.hashCode() : 0);
+        return result;
+    }
+    
+    public Artifact toArtifact() {
+        return new Artifact(groupId, artifactId, version, type);
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,178 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 05:10:24 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * 
+ *                 Provides the definition of a single named attribute. Attributes
+ *                 are mixed type and can include simple text and elements.
+ *             
+ * 
+ * <p>Java class for attributeType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="attributeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       &lt;attribute name="null" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *       &lt;attribute name="propertyEditor" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "attributeType", namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2", propOrder = {
+    "content"
+})
+public class AttributeType implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(required = true)
+    protected String name;
+    @XmlAttribute(name = "null")
+    protected Boolean _null;
+    @XmlAttribute
+    protected String propertyEditor;
+
+    /**
+     * 
+     *                 Provides the definition of a single named attribute. Attributes
+     *                 are mixed type and can include simple text and elements.
+     *             Gets the value of the content property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the content property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * {@link Object }
+     * {@link Element }
+     * 
+     * 
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<Object>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the null property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isNull() {
+        if (_null == null) {
+            return false;
+        } else {
+            return _null;
+        }
+    }
+
+    /**
+     * Sets the value of the null property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setNull(Boolean value) {
+        this._null = value;
+    }
+
+    /**
+     * Gets the value of the propertyEditor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPropertyEditor() {
+        return propertyEditor;
+    }
+
+    /**
+     * Sets the value of the propertyEditor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPropertyEditor(String value) {
+        this.propertyEditor = value;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,143 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 05:10:24 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for attributesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="attributesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="comment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;choice>
+ *           &lt;element name="module" type="{http://geronimo.apache.org/xml/ns/attributes-1.2}moduleType" maxOccurs="unbounded" minOccurs="0"/>
+ *           &lt;element name="configuration" type="{http://geronimo.apache.org/xml/ns/attributes-1.2}moduleType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "attributesType", namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2", propOrder = {
+    "comment",
+    "module",
+    "configuration"
+})
+public class AttributesType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2")
+    protected String comment;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2")
+    protected List<ModuleType> module;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2")
+    protected List<ModuleType> configuration;
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+    /**
+     * Gets the value of the module property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the module property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getModule().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ModuleType }
+     * 
+     * 
+     */
+    public List<ModuleType> getModule() {
+        if (module == null) {
+            module = new ArrayList<ModuleType>();
+        }
+        return this.module;
+    }
+
+    /**
+     * Gets the value of the configuration property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the configuration property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getConfiguration().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ModuleType }
+     * 
+     * 
+     */
+    public List<ModuleType> getConfiguration() {
+        if (configuration == null) {
+            configuration = new ArrayList<ModuleType>();
+        }
+        return this.configuration;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,206 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 05:10:24 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 Lets a plugin declare data that should be inserted into config.xml
+ *                 when the plugin is installed. This is normally used to add ports
+ *                 and other settings that the user is likely to want to change. The
+ *                 gbean entries declared here will be written into config.xml for the
+ *                 new module when the plugin is installed.
+ *             
+ * 
+ * <p>Java class for config-xml-contentType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="config-xml-contentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/attributes-1.2}comment" minOccurs="0"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/attributes-1.2}gbean" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="condition" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="load" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *       &lt;attribute name="server" type="{http://www.w3.org/2001/XMLSchema}string" default="default" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "config-xml-contentType", propOrder = {
+    "comment",
+    "gbean"
+})
+public class ConfigXmlContentType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2")
+    protected String comment;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2", required = true)
+    protected List<GbeanType> gbean;
+    @XmlAttribute
+    protected String condition;
+    @XmlAttribute
+    protected Boolean load;
+    @XmlAttribute
+    protected String server;
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+    /**
+     * Gets the value of the gbean property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the gbean property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getGbean().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link GbeanType }
+     * 
+     * 
+     */
+    public List<GbeanType> getGbean() {
+        if (gbean == null) {
+            gbean = new ArrayList<GbeanType>();
+        }
+        return this.gbean;
+    }
+
+    /**
+     * Gets the value of the condition property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCondition() {
+        return condition;
+    }
+
+    /**
+     * Sets the value of the condition property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCondition(String value) {
+        this.condition = value;
+    }
+
+    /**
+     * Gets the value of the load property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isLoad() {
+        if (load == null) {
+            return true;
+        } else {
+            return load;
+        }
+    }
+
+    /**
+     * Sets the value of the load property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setLoad(Boolean value) {
+        this.load = value;
+    }
+
+    /**
+     * Gets the value of the server property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getServer() {
+        if (server == null) {
+            return "default";
+        } else {
+            return server;
+        }
+    }
+
+    /**
+     * Sets the value of the server property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setServer(String value) {
+        this.server = value;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,154 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 05:10:24 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * 
+ *                 The name of a file in the plugin archive that should be copied into
+ *                 the server installation tree somewhere when the plugin is installed.
+ *                 There may be a path component (relative to the root of the plugin
+ *                 archive), though that will not be used to construct the destination
+ *                 location. For example:
+ * 
+ *                 
+ * <pre>
+ * &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;copy-file xmlns:atts="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:list="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:xs="http://www.w3.org/2001/XMLSchema" dest-dir="var/security/keystores" relative-to="server"&gt;
+ *                     resources/keystores/my-keystore
+ *                 &lt;/copy-file&gt;
+ * </pre>
+ * 
+ * 
+ *                 This will copy the file resources/keystores/my-keystore to e.g.
+ *                 var/security/keystores/my-keystore
+ *             
+ * 
+ * <p>Java class for copy-fileType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="copy-fileType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="dest-dir" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="relative-to" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="geronimo"/>
+ *             &lt;enumeration value="server"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "copy-fileType", propOrder = {
+    "value"
+})
+public class CopyFileType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "dest-dir", required = true)
+    protected String destDir;
+    @XmlAttribute(name = "relative-to", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String relativeTo;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the destDir property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDestDir() {
+        return destDir;
+    }
+
+    /**
+     * Sets the value of the destDir property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDestDir(String value) {
+        this.destDir = value;
+    }
+
+    /**
+     * Gets the value of the relativeTo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRelativeTo() {
+        return relativeTo;
+    }
+
+    /**
+     * Sets the value of the relativeTo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRelativeTo(String value) {
+        this.relativeTo = value;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,167 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 04:38:27 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 See pluginType/dependency above
+ *             
+ * 
+ * <p>Java class for dependencyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="dependencyType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://geronimo.apache.org/xml/ns/plugins-1.3}artifactType">
+ *       &lt;sequence>
+ *         &lt;element name="import" type="{http://geronimo.apache.org/xml/ns/plugins-1.3}importType" minOccurs="0"/>
+ *         &lt;element name="dependency" type="{http://geronimo.apache.org/xml/ns/plugins-1.3}artifactType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="start" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "dependencyType", propOrder = {
+    "_import",
+    "dependency"
+})
+public class DependencyType
+    extends ArtifactType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlElement(name = "import")
+    protected ImportType _import;
+    protected List<ArtifactType> dependency;
+    @XmlAttribute
+    protected Boolean start;
+
+    /**
+     * Gets the value of the import property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ImportType }
+     *     
+     */
+    public ImportType getImport() {
+        return _import;
+    }
+
+    /**
+     * Sets the value of the import property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ImportType }
+     *     
+     */
+    public void setImport(ImportType value) {
+        this._import = value;
+    }
+
+    /**
+     * Gets the value of the dependency property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the dependency property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDependency().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ArtifactType }
+     * 
+     * 
+     */
+    public List<ArtifactType> getDependency() {
+        if (dependency == null) {
+            dependency = new ArrayList<ArtifactType>();
+        }
+        return this.dependency;
+    }
+
+    /**
+     * Gets the value of the start property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isStart() {
+        if (start == null) {
+            return true;
+        } else {
+            return start;
+        }
+    }
+
+    /**
+     * Sets the value of the start property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setStart(Boolean value) {
+        this.start = value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+
+        DependencyType that = (DependencyType) o;
+
+        if (_import != that._import) return false;
+        if ((dependency != null && !dependency.isEmpty())? !dependency.equals(that.dependency) : (that.dependency != null && !that.dependency.isEmpty())) return false;
+        if (start != null ? !start.equals(that.start) : that.start != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (_import != null ? _import.hashCode() : 0);
+        result = 31 * result + (dependency != null && !dependency.isEmpty()? dependency.hashCode() : 0);
+        result = 31 * result + (start != null ? start.hashCode() : 0);
+        return result;
+    }
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,212 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 05:10:24 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 Element used by the plugin system to list individual GBeans.
+ *                 Note that the name attribute for a gbean element may hold either
+ *                 the full GBeanName, or only the value for the "name=" portion of
+ *                 the GBeanName. If there are multiple GBeans in the module with
+ *                 manageable attributes and the same "name=" portion of the
+ *                 GBeanName, then all must be listed and all must be listed with a
+ *                 full GBeanName.
+ *             
+ * 
+ * <p>Java class for gbeanType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="gbeanType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="comment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element ref="{http://geronimo.apache.org/xml/ns/attributes-1.2}attribute"/>
+ *           &lt;element name="reference" type="{http://geronimo.apache.org/xml/ns/attributes-1.2}referenceType"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *       &lt;attribute name="gbeanInfo" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="load" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "gbeanType", namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2", propOrder = {
+    "comment",
+    "attributeOrReference"
+})
+public class GbeanType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2")
+    protected String comment;
+    @XmlElements({
+        @XmlElement(name = "reference", namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2", type = ReferenceType.class),
+        @XmlElement(name = "attribute", namespace = "http://geronimo.apache.org/xml/ns/attributes-1.2", type = AttributeType.class)
+    })
+    protected List<Serializable> attributeOrReference;
+    @XmlAttribute
+    protected String gbeanInfo;
+    @XmlAttribute
+    protected Boolean load;
+    @XmlAttribute(required = true)
+    protected String name;
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+    /**
+     * Gets the value of the attributeOrReference property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the attributeOrReference property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAttributeOrReference().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ReferenceType }
+     * {@link AttributeType }
+     * 
+     * 
+     */
+    public List<Serializable> getAttributeOrReference() {
+        if (attributeOrReference == null) {
+            attributeOrReference = new ArrayList<Serializable>();
+        }
+        return this.attributeOrReference;
+    }
+
+    /**
+     * Gets the value of the gbeanInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGbeanInfo() {
+        return gbeanInfo;
+    }
+
+    /**
+     * Sets the value of the gbeanInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGbeanInfo(String value) {
+        this.gbeanInfo = value;
+    }
+
+    /**
+     * Gets the value of the load property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isLoad() {
+        if (load == null) {
+            return true;
+        } else {
+            return load;
+        }
+    }
+
+    /**
+     * Sets the value of the load property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setLoad(Boolean value) {
+        this.load = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java?rev=763999&view=auto
==============================================================================
--- geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java (added)
+++ geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java Fri Apr 10 18:35:10 2009
@@ -0,0 +1,112 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.08 at 05:10:24 PM PDT 
+//
+
+
+package org.apache.geronimo.system.plugin.model;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * 
+ *                 See pluginType/hash above
+ *             
+ * 
+ * <p>Java class for hashType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="hashType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="type" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="MD5"/>
+ *             &lt;enumeration value="SHA-1"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "hashType", propOrder = {
+    "value"
+})
+public class HashType
+    implements Serializable
+{
+
+    private final static long serialVersionUID = 12343L;
+    @XmlValue
+    protected String value;
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String type;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message