You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/12/23 03:48:41 UTC
svn commit: r728854 - in
/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks:
Dep.java Messages.properties
Author: ogusakov
Date: Mon Dec 22 18:48:40 2008
New Revision: 728854
URL: http://svn.apache.org/viewvc?rev=728854&view=rev
Log:
[MERCURY-65] preparing alternative syntax for ant tasks
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=728854&r1=728853&r2=728854&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Mon Dec 22 18:48:40 2008
@@ -39,6 +39,8 @@
private List<Artifact> _artifacts;
private String _configId;
+
+ String _pom;
private ArtifactScopeEnum _scope = ArtifactScopeEnum.compile;
@@ -47,7 +49,13 @@
protected List<ArtifactBasicMetadata> getDependencies()
{
if ( Util.isEmpty( _dependencies ) )
- return null;
+ {
+ if( Util.isEmpty( _pom ) )
+ return null;
+
+ // TODO: 2008-12-22 oleg: to be implemented
+ throw new UnsupportedOperationException( _lang.getMessage( "dep.pom.not.implemented" ) );
+ }
List<ArtifactBasicMetadata> res = new ArrayList<ArtifactBasicMetadata>( _dependencies.size() );
@@ -72,6 +80,8 @@
public class Dependency
{
ArtifactBasicMetadata _amd;
+
+ String _pom;
boolean _optional = false;
@@ -90,12 +100,22 @@
_amd.setOptional( optional );
}
+ public void setPom( String pom )
+ {
+ this._pom = pom;
+
+ // TODO: 2008-12-22 oleg: to be implemented
+ throw new UnsupportedOperationException( _lang.getMessage( "dep.dependency.pom.not.implemented" ) );
+ }
+
}
//----------------------------------------------------------------------------------------
protected List<Artifact> resolve()
throws Exception
{
- return resolve( AbstractAntTask.findConfig( getProject(), _configId ), _scope );
+ Config config = AbstractAntTask.findConfig( getProject(), _configId );
+
+ return resolve( config, _scope );
}
//----------------------------------------------------------------------------------------
protected List<Artifact> resolve( Config config, ArtifactScopeEnum scope )
@@ -171,6 +191,14 @@
this._scope = scope;
}
+ public void setPom( String pom )
+ {
+ this._pom = pom;
+
+ // TODO: 2008-12-22 oleg: to be implemented
+ throw new UnsupportedOperationException( _lang.getMessage( "dep.pom.not.implemented" ) );
+ }
+
public void setTransitive( boolean val )
{
this._transitive = val;
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties?rev=728854&r1=728853&r2=728854&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties Mon Dec 22 18:48:40 2008
@@ -37,3 +37,7 @@
config.repo.verifier.pgp.no.keyring=PGP verifier configuration does not have a keyring property
config.repo.verifier.bad.type=Verfier does not understand type {0}
config.repo.verifier.pgp.bad.keyid=Bad key "{0}" for secret keyring {1}; expected to see 16 hex number, but did not find them
+
+
+dep.pom.not.implemented=pom attribute not implemented for <dep ../> tag
+dep.dependency.pom.not.implemented=pom attribute not implemented for <dependency ../> tag
\ No newline at end of file