You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/12/02 05:08:25 UTC
cvs commit: maven-components/maven-model/src/java/org/apache/maven/model Branch.java Build.java Contributor.java Dependency.java Developer.java License.java MailingList.java Model.java Organization.java PackageGroup.java Repository.java Resource.java SourceModification.java TestResource.java Version.java
jvanzyl 2003/12/01 20:08:25
Modified: maven-model maven-model.ipr maven-model.iws
maven-model/src/java/org/apache/maven/model Branch.java
Build.java Contributor.java Dependency.java
Developer.java License.java MailingList.java
Model.java Organization.java PackageGroup.java
Repository.java Resource.java
SourceModification.java TestResource.java
Version.java
Log:
o adding some simple coverage even though the model is essentially a simple
bean. can't hurt.
Revision Changes Path
1.2 +2 -0 maven-components/maven-model/maven-model.ipr
Index: maven-model.ipr
===================================================================
RCS file: /home/cvs/maven-components/maven-model/maven-model.ipr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-model.ipr 1 Sep 2003 16:06:10 -0000 1.1
+++ maven-model.ipr 2 Dec 2003 04:08:25 -0000 1.2
@@ -11,12 +11,14 @@
<root type="composite">
<root type="simple" url="file:///$PROJECT_DIR$/src/java" />
<root type="jdk" rootType="sourcePath" name="java version "1.4.2"" />
+ <root type="simple" url="file://$PROJECT_DIR$/src/test" />
</root>
</sourcePath>
<classPath>
<root type="composite">
<root type="jdk" rootType="classPath" name="java version "1.4.2"" />
<root type="output" />
+ <root type="simple" url="jar:///home/jvanzyl/maven-repo-local/junit/jars/junit-3.8.1.jar!/" />
</root>
</classPath>
<excludePath>
1.2 +53 -25 maven-components/maven-model/maven-model.iws
Index: maven-model.iws
===================================================================
RCS file: /home/cvs/maven-components/maven-model/maven-model.iws,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-model.iws 1 Sep 2003 16:06:10 -0000 1.1
+++ maven-model.iws 2 Dec 2003 04:08:25 -0000 1.2
@@ -2,25 +2,41 @@
<project version="3" relativePaths="false">
<component name="FileEditorManager">
<history>
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="968" column="31" vertical-scroll-proportion="0.28454334" horizontal-scroll-proportion="0.22409639">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ResourceTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/SourceModificationTest.java" line="10" column="13" vertical-scroll-proportion="0.15970516" horizontal-scroll-proportion="0.09263658" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/UnitTestTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BranchTest.java" line="26" column="0" vertical-scroll-proportion="0.4052758" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Build.java" line="111" column="8" vertical-scroll-proportion="0.5551559" horizontal-scroll-proportion="0.057416268" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BuildTest.java" line="35" column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Developer.java" line="66" column="13" vertical-scroll-proportion="0.40767387" horizontal-scroll-proportion="0.09330144" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Contributor.java" line="88" column="7" vertical-scroll-proportion="0.22422062" horizontal-scroll-proportion="0.050239235" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DeveloperTest.java" line="21" column="19" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.13539192" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/LicenseTest.java" line="21" column="21" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.1496437" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/RepositoryTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/PackageGroupTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/OrganizationTest.java" line="29" column="28" vertical-scroll-proportion="0.45203838" horizontal-scroll-proportion="0.19952494" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/MailingListTest.java" line="35" column="30" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.21377672" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" />
</history>
<open-files>
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="968" column="31" vertical-scroll-proportion="0.28454334" horizontal-scroll-proportion="0.22409639" selected="true">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BuildTest.java" line="35" column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" selected="true" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DeveloperTest.java" line="21" column="19" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.13539192" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/LicenseTest.java" line="21" column="21" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.1496437" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/OrganizationTest.java" line="29" column="28" vertical-scroll-proportion="0.45203838" horizontal-scroll-proportion="0.19952494" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/PackageGroupTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/RepositoryTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/MailingListTest.java" line="35" column="30" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.21377672" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Contributor.java" line="88" column="7" vertical-scroll-proportion="0.22422062" horizontal-scroll-proportion="0.050239235" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Developer.java" line="66" column="13" vertical-scroll-proportion="0.40767387" horizontal-scroll-proportion="0.09330144" />
</open-files>
</component>
<component name="ToolWindowManager">
- <frame x="-5" y="0" width="1288" height="1025" extended-state="1" />
+ <frame x="-4" y="3" width="1288" height="1025" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" />
@@ -28,11 +44,10 @@
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.24959743" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33039647" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="5" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
<window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
</layout>
@@ -139,6 +154,12 @@
<option name="GROUP_GETTERS_AND_SETTERS" value="true" />
</component>
<component name="CvsConfiguration">
+ <cvs_root>
+ <option name="METHOD" value="ext" />
+ <option name="USER_NAME" value="jvanzyl" />
+ <option name="HOST" value="cvs.apache.org" />
+ <option name="REPOSITORY" value="/home/cvs/maven-components/maven-model" />
+ </cvs_root>
<Checkout>
<option name="DATE_TAG" value="" />
<option name="REVISION_TAG" value="" />
@@ -161,9 +182,9 @@
</Update>
<Commit>
<option name="NON_RECURSIVE" value="false" />
- <option name="REVISION_TAG" />
- <option name="LOG_MESSAGE" />
- <option name="ADDITIONAL_OPTIONS" />
+ <option name="REVISION_TAG" value="" />
+ <option name="LOG_MESSAGE" value="o removing use of ${basedir} o fixing nag email o trimming reports" />
+ <option name="ADDITIONAL_OPTIONS" value="" />
</Commit>
<Diff>
<option name="REVISION_TAG" value="HEAD" />
@@ -172,7 +193,7 @@
</Diff>
<Add>
<option name="ADD_AS_BINARY" value="false" />
- <option name="LOG_MESSAGE" />
+ <option name="LOG_MESSAGE" value="" />
</Add>
<Status>
<option name="NON_RECURSIVE" value="false" />
@@ -202,13 +223,13 @@
<option name="NON_RECURSIVE" value="false" />
<option name="FORCE_RECURSIVE" value="false" />
</Editors>
- <option name="CLIENT_PATH" value="" />
- <option name="EXTERNAL_DIFF_PATH" />
+ <option name="CLIENT_PATH" value="/usr/bin/cvs" />
+ <option name="EXTERNAL_DIFF_PATH" value="" />
<option name="USE_EXTERNAL_DIFF" value="false" />
<option name="WORKING_FILES_READONLY" value="false" />
<option name="COMPRESSION_LEVEL" value="0" />
<option name="ADDITIONAL_OPTIONS" value="" />
- <option name="BINARY_FILES_EXTENSIONS" />
+ <option name="BINARY_FILES_EXTENSIONS" value="" />
<option name="REUSE_LAST_LOG_MESSAGE" value="false" />
<option name="PUT_FOCUS_INTO_LOG_MESSAGE" value="false" />
<option name="SHOW_UPDATE_OPTIONS" value="true" />
@@ -226,18 +247,25 @@
<option name="HIDE_UP_TO_DATE_FILES" value="false" />
</component>
<component name="CvsVcs">
- <expanded_paths />
+ <expanded_paths>
+ <path value="$PROJECT_DIR$" />
+ </expanded_paths>
</component>
<component name="ProjectViewSettings">
<navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
<view id="ProjectPane">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/apache" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/apache/maven" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/apache/maven/model" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/apache/maven" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/apache" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/apache" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/apache/maven/model" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/apache/maven/model" />
</view>
<view id="SourcepathPane" />
<view id="ClasspathPane" />
@@ -446,7 +474,7 @@
</todo-panel>
</component>
<component name="VcsManagerConfiguration">
- <option name="ACTIVE_VCS_NAME" value="" />
+ <option name="ACTIVE_VCS_NAME" value="CVS" />
</component>
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
1.5 +4 -3 maven-components/maven-model/src/java/org/apache/maven/model/Branch.java
Index: Branch.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Branch.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Branch.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Branch.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -55,6 +55,7 @@
*
* ====================================================================
*/
+
import java.io.Serializable;
/**
@@ -62,8 +63,8 @@
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class Branch implements Serializable
-
+public class Branch
+ implements Serializable
{
/**
* Repository tag from which this branch
1.5 +4 -33 maven-components/maven-model/src/java/org/apache/maven/model/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Build.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Build.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Build.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -66,8 +66,8 @@
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class Build implements Serializable
-
+public class Build
+ implements Serializable
{
/**
* Path entries that control which source directories are used
@@ -87,15 +87,6 @@
private String unitTestSourceDirectory;
/**
- * @todo Kick this out! (Michal)
- *
- * I think that integration unit tests can be set up as sibling project.
- * Maybe even "smart reactor" can make it f.. easy to use.
- * The directory on where the integration unit test source files are stored.
- */
- private String integrationUnitTestSourceDirectory;
-
- /**
* Email address to which build related messages should be sent (for use
* by automated build tools, for example those that provide continuous
* integration).
@@ -117,28 +108,8 @@
public Build()
{
sourceModifications = new ArrayList();
- resources = new ArrayList();
- }
-
- /**
- * Get the integration unit test source directory.
- *
- * @return the directory for integration unit test java source code
- */
- public String getIntegrationUnitTestSourceDirectory()
- {
- return integrationUnitTestSourceDirectory;
- }
- /**
- * Set the integration unit test source direcotry.
- *
- * @param utDirectory the directory for integration unit test java source
- * code
- */
- public void setIntegrationUnitTestSourceDirectory( String utDirectory )
- {
- this.integrationUnitTestSourceDirectory = utDirectory;
+ resources = new ArrayList();
}
/**
1.5 +33 -40 maven-components/maven-model/src/java/org/apache/maven/model/Contributor.java
Index: Contributor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Contributor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Contributor.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Contributor.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -72,7 +72,8 @@
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class Contributor implements Serializable
+public class Contributor
+ implements Serializable
{
/**
* Contributor's email address. NOTE: there may eventually be more than
@@ -84,18 +85,12 @@
* Contributor's organziation.
*/
private String organization;
-
-
- /**
- * Contributor's id.
- */
- private String id;
-
- /**
- * Contributor's full name
- */
- private String name;
-
+
+ /**
+ * Contributor's full name
+ */
+ private String name;
+
/**
* Contributor's role(s) in the project.
@@ -195,31 +190,29 @@
{
this.url = url;
}
-
-
-
- /**
- * Gets the full name of the contributor.
- *
- * @return the full name of the contributor.
- */
-
- public String getName()
- {
- return name;
- }
-
- /**
- * Set the full name of the contributor.
- *
- * @param name the full name of the contributor
- */
-
- public void setName( String name )
- {
- this.name = name;
- }
-
-
+
+ /**
+ * Gets the full name of the contributor.
+ *
+ * @return the full name of the contributor.
+ */
+
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Set the full name of the contributor.
+ *
+ * @param name the full name of the contributor
+ */
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+
}
1.5 +53 -58 maven-components/maven-model/src/java/org/apache/maven/model/Dependency.java
Index: Dependency.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Dependency.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Dependency.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Dependency.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -55,18 +55,18 @@
*
* ====================================================================
*/
-
+
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-
/**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class Dependency implements Serializable
+public class Dependency
+ implements Serializable
{
/** Version associated with this dependency */
private String version;
@@ -93,7 +93,6 @@
private Map properties;
-
/**
* Default constructor
*/
@@ -101,7 +100,6 @@
{
}
-
/**
* Get Id = <code>"groupId:artifactId:type"<code>
@@ -113,12 +111,12 @@
id.append( getGroupId() );
id.append( ":" );
id.append( getArtifactId() );
- id.append(":");
+ id.append( ":" );
id.append( getType() );
return id.toString();
}
-
+
/**
* Set the group id.
*
@@ -140,7 +138,6 @@
}
-
/**
* Get the artifact id.
*
@@ -211,7 +208,7 @@
// screw up getArtifact() above.
if ( artifact.trim().length() == 0 )
{
- return;
+ return;
}
this.artifact = artifact;
}
@@ -246,9 +243,9 @@
*/
public String getType()
{
- if ( type == null || type.trim().length() == 0 )
+ if ( type == null || type.trim().length() == 0 )
{
- return "jar";
+ return "jar";
}
return type;
}
@@ -271,9 +268,9 @@
*/
public String getKind()
{
- if ( kind == null || kind.trim().length() == 0 )
+ if ( kind == null || kind.trim().length() == 0 )
{
- return "global";
+ return "global";
}
return type;
}
@@ -289,48 +286,48 @@
}
- /**
- *
- * @param key
- * @param value
- */
- public void addProperty( String key, Object value )
- {
- getProperties().put( key, value );
- }
-
- /**
- *
- * @param properties
- */
- public void setProperties( Map properties )
- {
- this.properties = properties;
- }
-
- /**
- *
- * @return
- */
- public Map getProperties()
- {
- if ( properties == null )
- {
- properties = new HashMap();
- }
-
- return properties;
- }
-
- /**
- * Gets the "short" id of this dependecy = <code>getGroupId() + ":" + getArtifactId()</code>
- * Short id matches POM id of the projects which generarted this dependency.
- * @return short id of this dependecy.
- */
- public String getShortId()
- {
- return getGroupId() + ":" + getArtifactId();
- }
+ /**
+ *
+ * @param key
+ * @param value
+ */
+ public void addProperty( String key, Object value )
+ {
+ getProperties().put( key, value );
+ }
+
+ /**
+ *
+ * @param properties
+ */
+ public void setProperties( Map properties )
+ {
+ this.properties = properties;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public Map getProperties()
+ {
+ if ( properties == null )
+ {
+ properties = new HashMap();
+ }
+
+ return properties;
+ }
+
+ /**
+ * Gets the "short" id of this dependecy = <code>getGroupId() + ":" + getArtifactId()</code>
+ * Short id matches POM id of the projects which generarted this dependency.
+ * @return short id of this dependecy.
+ */
+ public String getShortId()
+ {
+ return getGroupId() + ":" + getArtifactId();
+ }
/**
* Debug string.
@@ -341,8 +338,6 @@
{
return "Dep[" + getId() + " ]";
}
-
-
}
1.5 +6 -4 maven-components/maven-model/src/java/org/apache/maven/model/Developer.java
Index: Developer.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Developer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Developer.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Developer.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -61,10 +61,11 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:glenn@somanetworks.com">Glenn McAllister</a>
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class Developer extends Contributor
+public class Developer
+ extends Contributor
{
/** The username of the developer */
private String id;
@@ -75,6 +76,7 @@
public Developer()
{
}
+
/**
* Gets The username of the developer
* @return The username of the developer
@@ -88,7 +90,7 @@
* Sets The username of the developer.
* @param id the username of the developer
*/
- public void setId(String id)
+ public void setId( String id )
{
this.id = id;
}
1.5 +4 -3 maven-components/maven-model/src/java/org/apache/maven/model/License.java
Index: License.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/License.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- License.java 9 Oct 2003 10:41:16 -0000 1.4
+++ License.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -62,10 +62,11 @@
* A License as specified in the project descriptor
*
* @author <a href="mailto:bwalding@apache.org">Ben Walding</a>
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class License implements Serializable
+public class License
+ implements Serializable
{
private String name;
private String url;
1.5 +23 -23 maven-components/maven-model/src/java/org/apache/maven/model/MailingList.java
Index: MailingList.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/MailingList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailingList.java 9 Oct 2003 10:41:16 -0000 1.4
+++ MailingList.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -60,16 +60,17 @@
/**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class MailingList implements Serializable
+public class MailingList
+ implements Serializable
{
/**
* The name of the mailing list
*/
private String name;
-
+
/**
* Subcribe email address.
*/
@@ -85,7 +86,6 @@
*/
private String archive;
-
/**
* Constructor for the MailingList object
@@ -93,24 +93,24 @@
public MailingList()
{
}
-
- /**
- * Gets the name attribute of the MailingList object
- * @return the name of the mailing list
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * Sets the name attribute of the MailingList object
- * @param name the name of the mailing list
- */
- public void setName( String name )
- {
- this.name = name;
- }
+
+ /**
+ * Gets the name attribute of the MailingList object
+ * @return the name of the mailing list
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the name attribute of the MailingList object
+ * @param name the name of the mailing list
+ */
+ public void setName( String name )
+ {
+ this.name = name;
+ }
/**
* Sets the subscribe attribute of the MailingList object
1.6 +56 -58 maven-components/maven-model/src/java/org/apache/maven/model/Model.java
Index: Model.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Model.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Model.java 13 Nov 2003 13:22:07 -0000 1.5
+++ Model.java 2 Dec 2003 04:08:25 -0000 1.6
@@ -79,7 +79,6 @@
*/
public class Model
implements Serializable
-
{
/** Type of artifact this model refers to. */
private String type;
@@ -193,7 +192,7 @@
/** ArtifactId. */
private String artifactId;
-
+
/** Name */
private String name;
@@ -258,27 +257,27 @@
return type;
}
- /**
- * Set the name of this project
-
- *
- * @param name The name
- */
- public void setName( String name )
- {
- this.name = name;
- }
-
- /**
- * Get the name of this project.
- *
- * @return The name
- */
- public String getName()
- {
- return name;
- }
-
+ /**
+ * Set the name of this project
+
+ *
+ * @param name The name
+ */
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the name of this project.
+ *
+ * @return The name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
/**
* Set the project group id.
@@ -931,7 +930,7 @@
public void addVersion( Version version )
{
versions.add( version );
- versionMap.put( version.getTag() , version );
+ versionMap.put( version.getTag(), version );
}
/**
@@ -1052,39 +1051,38 @@
{
branches.add( b );
}
-
-
- /**
- *
- * @param key
- * @param value
- */
- public void addProperty( String key, Object value )
- {
- getProperties().put( key, value );
- }
-
- /**
- *
- * @param properties
- */
- public void setProperties( Map properties )
- {
- this.properties = properties;
- }
-
- /**
- *
- * @return
- */
- public Map getProperties()
- {
- if ( properties == null )
- {
- properties = new HashMap();
- }
- return properties;
- }
+ /**
+ *
+ * @param key
+ * @param value
+ */
+ public void addProperty( String key, Object value )
+ {
+ getProperties().put( key, value );
+ }
+
+ /**
+ *
+ * @param properties
+ */
+ public void setProperties( Map properties )
+ {
+ this.properties = properties;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public Map getProperties()
+ {
+ if ( properties == null )
+ {
+ properties = new HashMap();
+ }
+
+ return properties;
+ }
}
1.5 +24 -23 maven-components/maven-model/src/java/org/apache/maven/model/Organization.java
Index: Organization.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Organization.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Organization.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Organization.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -60,16 +60,17 @@
/**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class Organization implements Serializable
- {
+public class Organization
+ implements Serializable
+{
/**
* The full name of the organization
*/
private String name;
-
+
/**
* Organization url
*/
@@ -79,25 +80,25 @@
* Organization logo
*/
private String logo;
-
- /**
- * Sets the name attribute of the Organization object
- * @param url the full name of the organization
- */
- public void setName( String name )
- {
- this.name = name;
- }
- /**
- * Gets the full name of the organization.
- *
- * @return the full name of the organization.
- */
- public String getName()
- {
- return name;
- }
+ /**
+ * Sets the name attribute of the Organization object
+ * @param url the full name of the organization
+ */
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ /**
+ * Gets the full name of the organization.
+ *
+ * @return the full name of the organization.
+ */
+ public String getName()
+ {
+ return name;
+ }
/**
* Sets the url attribute of the Organization object
1.5 +3 -1 maven-components/maven-model/src/java/org/apache/maven/model/PackageGroup.java
Index: PackageGroup.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/PackageGroup.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PackageGroup.java 9 Oct 2003 10:41:16 -0000 1.4
+++ PackageGroup.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -65,9 +65,11 @@
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version PackageGroup.java,v 1.1 2003/01/07 08:23:27 jstrachan Exp
*/
-public class PackageGroup implements Serializable
+public class PackageGroup
+ implements Serializable
{
private String title;
+
private String packages;
/**
1.5 +3 -2 maven-components/maven-model/src/java/org/apache/maven/model/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Repository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Repository.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Repository.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -69,7 +69,8 @@
* @todo Check on the CVS specific methods at the bottom of this file. I believe they
* are used by the gump plugin.
*/
-public class Repository implements Serializable
+public class Repository
+ implements Serializable
{
/** Connection URL. */
private String connection;
1.5 +3 -2 maven-components/maven-model/src/java/org/apache/maven/model/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Resource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Resource.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Resource.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -64,9 +64,10 @@
* Represents a set of files in a single directory.
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
*/
-public class Resource implements Serializable
+public class Resource
+ implements Serializable
{
/** Resource Directory */
private String dir;
1.5 +3 -2 maven-components/maven-model/src/java/org/apache/maven/model/SourceModification.java
Index: SourceModification.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/SourceModification.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SourceModification.java 9 Oct 2003 10:41:16 -0000 1.4
+++ SourceModification.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -66,7 +66,8 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id$
*/
-public class SourceModification extends Resource
+public class SourceModification
+ extends Resource
{
/**
* Class name to check for in the classpath. If it is present then perform
1.5 +2 -1 maven-components/maven-model/src/java/org/apache/maven/model/TestResource.java
Index: TestResource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/TestResource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestResource.java 9 Oct 2003 10:41:16 -0000 1.4
+++ TestResource.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -65,7 +65,8 @@
*
* @deprecated Resource is prefered.
*/
-public class TestResource extends Resource
+public class TestResource
+ extends Resource
{
// Empty, alias for parent class Resource.
}
1.5 +16 -15 maven-components/maven-model/src/java/org/apache/maven/model/Version.java
Index: Version.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Version.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Version.java 9 Oct 2003 10:41:16 -0000 1.4
+++ Version.java 2 Dec 2003 04:08:25 -0000 1.5
@@ -55,13 +55,15 @@
*
* ====================================================================
*/
+
import java.io.Serializable;
/**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id$
*/
-public class Version implements Serializable
+public class Version
+ implements Serializable
{
/**
* Repository tag from which this distribution
@@ -69,13 +71,13 @@
*/
private String tag;
- /**
+ /**
* A unique identifier for a version. This ID is used to specify the version that maven:dist builds.
*/
private String id;
/**
- * The external version number under which this release was distributed.
+ * The external version number under which this release was distributed.
* Examples include: 1.0 , 1.1-alpha1 , 1.2-beta , 1.3.2 etc.
*/
private String name;
@@ -92,7 +94,7 @@
*
* @param tag the repository tag from which this distribution is made
*/
- public void setTag(String tag)
+ public void setTag( String tag )
{
this.tag = tag;
}
@@ -108,9 +110,9 @@
}
/**
- * Gets a unique identifier for a version.
+ * Gets a unique identifier for a version.
* This ID is used to specify the version that maven:dist builds
- *
+ *
* @return a unique identifier for a version.
*/
public String getId()
@@ -119,19 +121,18 @@
}
/**
- *
- * Sets a unique identifier for a version.
*
- * @return the repository tag from which this distribution is made
+ * Sets a unique identifier for a version.
+ *
* @param id an unique id
*/
- public void setId(String id)
+ public void setId( String id )
{
this.id = id;
}
- /**
- * Gets an external version number under which this release was distributed.
+ /**
+ * Gets an external version number under which this release was distributed.
* @return the name of the version.
*/
public String getName()
@@ -140,10 +141,10 @@
}
/**
- * Sets an external version number under which this release was distributed.
+ * Sets an external version number under which this release was distributed.
* @param name the name of the version. Examples include: 1.0 , 1.1-alpha1 , 1.2-beta , 1.3.2 etc.
*/
- public void setName(String name)
+ public void setName( String name )
{
this.name = name;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org