You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/03/17 07:00:53 UTC
svn commit: r637731 - in /geronimo/gshell/trunk/gshell-model/src:
main/java/org/apache/geronimo/gshell/model/application/
main/java/org/apache/geronimo/gshell/model/common/
test/java/org/apache/geronimo/gshell/model/application/
test/resources/org/apac...
Author: jdillon
Date: Sun Mar 16 23:00:45 2008
New Revision: 637731
URL: http://svn.apache.org/viewvc?rev=637731&view=rev
Log:
Add more application configuration details
Added:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/SourceRepository.java
- copied, changed from r637576, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java
Modified:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
geronimo/gshell/trunk/gshell-model/src/test/resources/org/apache/geronimo/gshell/model/application/application1.xml
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java?rev=637731&r1=637730&r2=637731&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java Sun Mar 16 23:00:45 2008
@@ -23,9 +23,11 @@
import org.apache.geronimo.gshell.model.common.ModelRoot;
import org.apache.geronimo.gshell.model.common.Dependency;
import org.apache.geronimo.gshell.model.common.DependencyGroup;
+import org.apache.geronimo.gshell.model.common.SourceRepository;
import java.util.List;
import java.util.ArrayList;
+import java.util.Properties;
/**
* Application model root element.
@@ -36,17 +38,17 @@
public class Application
extends ModelRoot
{
- // ID
+ private String id;
- // Name
+ private String name;
- // Description
-
- // Properties
+ private String description;
+
+ private Properties properties;
// Repository
- // Source Repositories
+ private List<SourceRepository> sourceRepositories;
private List<Dependency> dependencies;
@@ -57,6 +59,52 @@
// Branding
// Paths
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(final String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(final String description) {
+ this.description = description;
+ }
+
+ public Properties getProperties() {
+ return properties;
+ }
+
+ public void setProperties(final Properties properties) {
+ this.properties = properties;
+ }
+
+ public List<SourceRepository> sourceRepositories() {
+ return sourceRepositories;
+ }
+
+ public void add(final SourceRepository repository) {
+ assert repository != null;
+
+ if (sourceRepositories == null) {
+ sourceRepositories = new ArrayList<SourceRepository>();
+ }
+
+ sourceRepositories.add(repository);
+ }
public List<Dependency> dependencies() {
return dependencies;
Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/SourceRepository.java (from r637576, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/SourceRepository.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/SourceRepository.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java&r1=637576&r2=637731&rev=637731&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/SourceRepository.java Sun Mar 16 23:00:45 2008
@@ -22,21 +22,27 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
/**
- * Dependency artifact configuration.
+ * Source repository configuration.
*
* @version $Rev$ $Date$
*/
-@XStreamAlias("dependency")
-public class Dependency
- extends DependencySupport
+@XStreamAlias("sourceRepository")
+public class SourceRepository
+ extends ModelElement
{
- private transient DependencyGroup dependencyGroup;
+ // ID
- public DependencyGroup getDependencyGroup() {
- return dependencyGroup;
+ // Name
+
+ private String location;
+
+ // Layout
+
+ public String getLocation() {
+ return location;
}
- public void setDependencyGroup(final DependencyGroup group) {
- this.dependencyGroup = group;
+ public void setLocation(final String location) {
+ this.location = location;
}
}
Modified: geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java?rev=637731&r1=637730&r2=637731&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java Sun Mar 16 23:00:45 2008
@@ -22,9 +22,12 @@
import junit.framework.TestCase;
import org.apache.geronimo.gshell.model.common.Dependency;
import org.apache.geronimo.gshell.model.common.DependencyGroup;
+import org.apache.geronimo.gshell.model.common.SourceRepository;
import java.net.URL;
+import java.net.URI;
import java.io.InputStream;
+import java.util.Properties;
/**
* Test for the {@link ApplicationMarshaller} class.
@@ -38,6 +41,18 @@
public void testMarshal1() throws Exception {
Application root = new Application();
+
+ root.setId("app.test");
+ root.setName("App Test");
+ root.setDescription("A test app descriptor.");
+
+ Properties props = new Properties();
+ props.setProperty("a", "b");
+ root.setProperties(props);
+
+ SourceRepository sr1 = new SourceRepository();
+ sr1.setLocation("foo:bar");
+ root.add(sr1);
Dependency d1 = new Dependency();
d1.setGroupId("a");
Modified: geronimo/gshell/trunk/gshell-model/src/test/resources/org/apache/geronimo/gshell/model/application/application1.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/test/resources/org/apache/geronimo/gshell/model/application/application1.xml?rev=637731&r1=637730&r2=637731&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/test/resources/org/apache/geronimo/gshell/model/application/application1.xml (original)
+++ geronimo/gshell/trunk/gshell-model/src/test/resources/org/apache/geronimo/gshell/model/application/application1.xml Sun Mar 16 23:00:45 2008
@@ -21,6 +21,19 @@
<!-- $Rev$ $Date$ -->
<application>
+ <id>app.test</id>
+ <name>App Test</name>
+ <description>A test app descriptor.</description>
+
+ <properties>
+ <property name="a" value="b"/>
+ </properties>
+
+ <sourceRepositories>
+ <sourceRepository>
+ <location>foo:bar</location>
+ </sourceRepository>
+ </sourceRepositories>
<dependencies>
<dependency>
@@ -34,15 +47,15 @@
<dependencyGroup>
<groupId>d</groupId>
<version>e</version>
+
<dependency>
<artifactId>f</artifactId>
</dependency>
-
+
<dependency>
<artifactId>g</artifactId>
<classifier>h</classifier>
</dependency>
</dependencyGroup>
</dependencyGroups>
-
</application>