Re: Problems of EJB plugin and Dependencies download

2003-06-19 Thread dion
I'm +0 on 2/ and -1 on 1/
--
dIon Gillard, Multitask Consulting
Blog:  http://blogs.codehaus.org/people/dion/
Work:  http://www.multitask.com.au


Vincent Massol [EMAIL PROTECTED] wrote on 19/06/2003 02:01:04 AM:

 Hi,
 
 The EJB plugin ejb:install goal installs its artifacts in
 groupId/ejbs/artifactId-version.jar (note the jar extension).
 
 However, the maven dependency resolver looks for a file named:
 groupId/ejbs/artifactId-version.ejb (not the ejb extension)
 
 Thus it fails to find the artifact...
 
 Several solutions:
 
 1/ All jar files (.ear, .jar, .war are considered of the jar type)
 
 2/ The dependency resolver supports .jar extensions when using the ejb
 type. In other words there is mapping between artifact type and
 artifact extension instead of assuming extension = artifact type.
 
 Currently the EJB, WAR and EAR plugins put their artifacts in
 **/ejbs/**, **/wars/** and **/ears/**.
 
 What do we do?
 
 Thanks
 -Vincent
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 


RE: Recent changes in war plugin

2003-06-19 Thread Vincent Massol


 -Original Message-
 From: Michal Maczka [mailto:[EMAIL PROTECTED]
 Sent: 18 June 2003 22:01
 To: Maven Developers List
 Subject: RE: Recent changes in war plugin

[snip]

  I think we're talking about the same thing. You can have a jelly
taglib
  that wraps the Ant manifest task.
 
 
 Hmm. Haven't thought of that...
 
 I think that jelly or velocity were born for that!
 I am using velocity at the moment. And want to give to user
 a chance to provide his own template.
 
 Can you take a look at
 
 \plugins-build\artifact\src\plugin-resources\templates\manifest.vm?
 
 Do you think it is possible to make the same with ant manifest task?

Hmm. I'm not sure velocity is the right tool. I think Jelly is much more
powerful. What you are simply doing is externalizing the script that
creates the manifest. This could be done in the same way with a jelly
script called manifest.jelly which could be overridden by the user.

Personally I don't think we need that much flexibility. A manifest is a
manifest and there is a standard spec for it. So the margin for
creactivity is very limited for a manifest!

 
 Michal
 It's a pity that we have communicate via emails.

Yep...

 
 Normalment on porrait aller au cafeteria pour disscuter :)

tout a fait... :-)

Djienkuje. Do widzenia. (not sure about the spelling of these...
hehe...)
-Vincent


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



new Artifact plugin and WAR plugin war:install goal

2003-06-19 Thread Vincent Massol
Hi Michal,

I've had a look at the source code for the new artifact plugin... and it
is really proof-of-concept code at this stage and I'm totally sure there
are lots of bugs (it is really far from production quality right now). I
don't mind that but I do mind using it in our WAR plugin at this point
in time. Especially as we're so close from a release.

I'd like to restore the old war:install goal for the time being. Once
the artifact plugin works we will then be able to swap for it. 

What do you think?

Thanks
-Vincent


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Why is the java source directory named main for plugins?

2003-06-19 Thread Vincent Massol
Hi,

Why is the java source directory named main for plugins (instead of
java)?

Thanks
-Vincent


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer DefaultArtifactDeployer.java MavenDeployRequest.java

2003-06-19 Thread michal
michal  2003/06/19 03:52:25

  Modified:src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer
DefaultArtifactDeployer.java
MavenDeployRequest.java
  Log:
  Install goal fixed
  
  Revision  ChangesPath
  1.3   +22 -12
maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
  
  Index: DefaultArtifactDeployer.java
  ===
  RCS file: 
/home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultArtifactDeployer.java  17 Jun 2003 22:06:00 -  1.2
  +++ DefaultArtifactDeployer.java  19 Jun 2003 10:52:25 -  1.3
  @@ -142,7 +142,7 @@
   }
   
   /**
  - * Istall given file in repsoitory 
  + * Install given file in local repsoitory 
* @param artifact the artifact file to insatall 
* @param type The type of the artiafct
* @param project 
  @@ -156,22 +156,32 @@
   String version)
   throws MavenException
   {
  -String repositoryPath = getRepositoryPath(type, project, version);
  +
   try
  -{
  -String dest = getLocalRepository(project) + / + repositoryPath;
  +{
  +File file =
  +new File(
  +getLocalRepository(project),
  +getRepositoryPath(type, project, version));
  +
  +if (!file.exists())
  +{
  +file.mkdirs();
  +}
  +file = new File(file, getRepositoryFile(type, project, version));
   System.out.println(
  -Copying: from ' + artifact + ' to: ' + dest + ');
  -FileUtils.copyFile(new File(artifact), new File(dest));
  +Copying: from ' + artifact + ' to: ' + file + ');
  +FileUtils.copyFile(new File(artifact), file);
  +
   }
   catch (IOException e)
   {
   String msg =
   Cannot install file: '
  -+ repositoryPath
  ++ artifact
   + '. Reason: 
   + e.getMessage();
  -throw new MavenException(msg);
  +throw new MavenException(msg, e);
   }
   
   }
  @@ -201,13 +211,13 @@
   if (distSite != null  distSite.length()  0)
   {
   project.getContext().setVariable(
  -maven.deploy.default.url,
  +maven.deploy.repo.central,
   project.getDistributionSite());
   project.getContext().setVariable(
  -maven.deploy.default.dir,
  +maven.deploy.repo.central.directory,
   project.getDistributionDirectory());
   
  -repos = default,  + repos;
  +repos = central,  + repos;
   }
   
   String repositoryPath = getRepositoryPath(type, project, version);
  
  
  
  1.2   +17 -11
maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/MavenDeployRequest.java
  
  Index: MavenDeployRequest.java
  ===
  RCS file: 
/home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/MavenDeployRequest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MavenDeployRequest.java   17 Jun 2003 22:06:00 -  1.1
  +++ MavenDeployRequest.java   19 Jun 2003 10:52:25 -  1.2
  @@ -88,44 +88,49 @@
   super();
   String username =
   (String) project.getContext().getVariable(
  -maven.deploy. + repository + .username);
  +maven.deploy.repo. + repository + .username);
   
   System.out.println(repository +  username: + username);
   String password =
   (String) project.getContext().getVariable(
  -maven.deploy. + repository + .password);
  +maven.deploy.repo. + repository + .password);
   
   System.out.println(repository +  password: ' + password + ');
   
   String passphrase =
   (String) project.getContext().getVariable(
  -maven.deploy. + repository + .passphrase);
  +maven.deploy.repo. + repository + .passphrase);
   
   String privateKey =
   (String) project.getContext().getVariable(
  -maven.deploy. + repository + .privatekey);
  +maven.deploy.repo. + repository + .privatekey);
   
   String url =
   (String) project.getContext().getVariable(
  -maven.deploy. + repository + .url);
  +

RE: new Artifact plugin and WAR plugin war:install goal

2003-06-19 Thread Michal Maczka
I quickly committed latest version which has install goal fixed.
Install snapshot should also work.
So I guess functionality is matching the old code.

But no problem fell free to use old install goal if you still have a
problems.

Michal

P.S

Note that war plugin haven't got deploy and deploy-snapshot install-snapshot
goals before





 -Original Message-
 From: Vincent Massol [mailto:[EMAIL PROTECTED]
 Sent: Thursday, June 19, 2003 12:33 PM
 To: 'Maven Developers List'
 Subject: new Artifact plugin and WAR plugin war:install goal


 Hi Michal,

 I've had a look at the source code for the new artifact plugin... and it
 is really proof-of-concept code at this stage and I'm totally sure there
 are lots of bugs (it is really far from production quality right now). I
 don't mind that but I do mind using it in our WAR plugin at this point
 in time. Especially as we're so close from a release.

 I'd like to restore the old war:install goal for the time being. Once
 the artifact plugin works we will then be able to swap for it.

 What do you think?

 Thanks
 -Vincent


 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]


 --
 Klikaj!!! I skorzystaj!!!  http://link.interia.pl/f1739






-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RFC: Deployer properties

2003-06-19 Thread Michal Maczka


With new deployer API I am going to support deployment to many remote
repsoitories.
In reality many = 2 in most of the cases. But 21 ..

I am proposiing to use follwoing properties:

#the list of repositories. repo1, repo2 are aliases or nicknames of
repositories
maven.repo.deploy = repo1, repo2, ibiblio


maven.repo.repo1= ftp://www.foo.com
maven.repo.repo1.dir = /repository
maven.repo.repo1.username= foo
maven.repo.repo1.password= baa
maven.repo.repo1.remote.group= goo

maven.repo.repo2 = file:///c:/temp
maven.repo.repo2.directory = /repository

maven.repo.ibiblio = http://www.ibiblio.org
maven.repo.ibiblio.directory = /maven


etc.

For each repository following properties can be set ( I hope that names are
selfexplaing):


maven.repo.${repo alias}.dir = /repository
maven.deploy.repo.${repo alias}.username= foo
maven.repo.${repo alias}.password= baa
maven.repo.${repo alias}.remote.group= goo
maven.repo.${repo alias}.port= 23
maven.repo.${repo alias}.privatekey= ./ssh/keys/somefile
maven.repo.${repo alias}.passphrase= baa
maven.repo.proxy=192.168.2.15
maven.repo.proxy.username= foo
maven.repo.proxy.password= foo
maven.repo.proxy.port= 81



There is one special case:

In POM (project.xml) we have
 ...
  siteAddressmaven.apache.org/siteAddress
  siteDirectory/www/maven.apache.org//siteDirectory
 ...


In this case properties for this repository can be set

using alias central

so e.g.

maven.deploy.repo.central.dir = /repository
maven.deploy.repo.central.username= foo
maven.deploy.repo.central.privatekey= ./ssh/keys/somefile


Michal

P.S.

Am I right that we need just one proxy server?
I think repos setting and proxy server settings can be shared beween
deployer and fetch.




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: new Artifact plugin and WAR plugin war:install goal

2003-06-19 Thread Vincent Massol
Thanks Michal. The war:install goal seems to be working for me now, so
I'll leave it as it is.

Thanks
-Vincent

 -Original Message-
 From: Michal Maczka [mailto:[EMAIL PROTECTED]
 Sent: 19 June 2003 13:00
 To: Maven Developers List
 Subject: RE: new Artifact plugin and WAR plugin war:install goal
 
 I quickly committed latest version which has install goal fixed.
 Install snapshot should also work.
 So I guess functionality is matching the old code.
 
 But no problem fell free to use old install goal if you still have a
 problems.
 
 Michal
 
 P.S
 
 Note that war plugin haven't got deploy and deploy-snapshot install-
 snapshot
 goals before
 
 
 
 
 
  -Original Message-
  From: Vincent Massol [mailto:[EMAIL PROTECTED]
  Sent: Thursday, June 19, 2003 12:33 PM
  To: 'Maven Developers List'
  Subject: new Artifact plugin and WAR plugin war:install goal
 
 
  Hi Michal,
 
  I've had a look at the source code for the new artifact plugin...
and it
  is really proof-of-concept code at this stage and I'm totally sure
there
  are lots of bugs (it is really far from production quality right
now). I
  don't mind that but I do mind using it in our WAR plugin at this
point
  in time. Especially as we're so close from a release.
 
  I'd like to restore the old war:install goal for the time being.
Once
  the artifact plugin works we will then be able to swap for it.
 
  What do you think?
 
  Thanks
  -Vincent
 
 
 
-
  To unsubscribe, e-mail: [EMAIL PROTECTED]
  For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
--
  Klikaj!!! I skorzystaj!!!  http://link.interia.pl/f1739
 
 
 
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RFC: Deployer properties

2003-06-19 Thread Michal Maczka
Please comment this:


With new deployer API I am going to support deployment to many remote
repositories.
In reality many = 2 in most of the cases. But 21 ..

I am proposing to use following properties:

#the list of repositories. repo1, repo2 are aliases or nicknames of
repositories
maven.deploy.repos = repo1, repo2, ibiblio

(I think individual settings for each repository can be shared between
deployer and fetch)


maven.repo.repo1= ftp://www.foo.com
maven.repo.repo1.dir = /repository
maven.repo.repo1.username= foo
maven.repo.repo1.password= baa
maven.repo.repo1.remote.group= goo

maven.repo.repo2 = file:///c:/temp
maven.repo.repo2.directory = /repository

maven.deploy.repo.ibiblio = http://www.ibiblio.org
maven.deploy.repo.ibiblio.directory = /maven


etc.

For each repository following properties can be set ( I hope that names are
selfexplaing):


maven.repo.${repo alias}.dir = /repository
maven.repo.${repo alias}.username= foo
maven.repo.${repo alias}.password= baa
maven.repo.${repo alias}.remote.group= goo
maven.repo.${repo alias}.port= 23
maven.repo.${repo alias}.privatekey= ./ssh/keys/somefile
maven.repo.${repo alias}.passphrase= baa
maven.repo.proxy=192.168.2.15
maven.repo.proxy.username= foo
maven.repo.proxy.password= foo
maven.repo.proxy.port= 81



There is one special case:

In POM (project.xml) we have
 ...
  siteAddressmaven.apache.org/siteAddress
  siteDirectory/www/maven.apache.org//siteDirectory
 ...


In this case properties for this repository can be set

using alias central

so e.g.

maven.repo.central.username= foo
maven.repo.central.privatekey= ./ssh/keys/somefile


Michal

P.S.

Am I right that we need just one proxy server?




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: new Artifact plugin and WAR plugin war:install goal

2003-06-19 Thread Jason van Zyl
On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:
 Hi Michal,
 
 I've had a look at the source code for the new artifact plugin... and it
 is really proof-of-concept code at this stage and I'm totally sure there
 are lots of bugs (it is really far from production quality right now). I
 don't mind that but I do mind using it in our WAR plugin at this point
 in time. Especially as we're so close from a release.
 
 I'd like to restore the old war:install goal for the time being. Once
 the artifact plugin works we will then be able to swap for it. 
 
 What do you think?

+1

 Thanks
 -Vincent
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
-- 
jvz.

Jason van Zyl
[EMAIL PROTECTED]
http://tambora.zenplex.org

In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
  
  -- Jacques Ellul, The Technological Society


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Why is the java source directory named main for plugins?

2003-06-19 Thread Jason van Zyl
On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:
 Hi,
 
 Why is the java source directory named main for plugins (instead of
 java)?

/src/test
/src/main

Seem to make more sense as a pattern as the testing code is also 'java'
code.

 Thanks
 -Vincent
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
-- 
jvz.

Jason van Zyl
[EMAIL PROTECTED]
http://tambora.zenplex.org

In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
  
  -- Jacques Ellul, The Technological Society


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: Why is the java source directory named main for plugins?

2003-06-19 Thread Vincent Massol


 -Original Message-
 From: Jason van Zyl [mailto:[EMAIL PROTECTED]
 Sent: 19 June 2003 15:02
 To: Maven Developers List
 Subject: Re: Why is the java source directory named main for
plugins?
 
 On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:
  Hi,
 
  Why is the java source directory named main for plugins (instead
of
  java)?
 
 /src/test
 /src/main
 
 Seem to make more sense as a pattern as the testing code is also
'java'
 code.

Ok, my comment wasn't about whether the name made more sense or not
about consistency. At present we use src/java everywhere else and
everyone I know who uses maven also uses this convention. 

In cvs we also src/java for Maven...

-Vincent

 
  Thanks
  -Vincent
 
 
 
-
  To unsubscribe, e-mail: [EMAIL PROTECTED]
  For additional commands, e-mail: [EMAIL PROTECTED]
 --
 jvz.
 
 Jason van Zyl
 [EMAIL PROTECTED]
 http://tambora.zenplex.org
 
 In short, man creates for himself a new religion of a rational
 and technical order to justify his work and to be justified in it.
 
   -- Jacques Ellul, The Technological Society
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: Why is the java source directory named main for plugins?

2003-06-19 Thread Jason van Zyl
On Thu, 2003-06-19 at 09:23, Vincent Massol wrote:
  -Original Message-
  From: Jason van Zyl [mailto:[EMAIL PROTECTED]
  Sent: 19 June 2003 15:02
  To: Maven Developers List
  Subject: Re: Why is the java source directory named main for
 plugins?
  
  On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:
   Hi,
  
   Why is the java source directory named main for plugins (instead
 of
   java)?
  
  /src/test
  /src/main
  
  Seem to make more sense as a pattern as the testing code is also
 'java'
  code.
 
 Ok, my comment wasn't about whether the name made more sense or not
 about consistency. At present we use src/java everywhere else and
 everyone I know who uses maven also uses this convention. 
 
 In cvs we also src/java for Maven...

Then for consistency and a sensible layout I would like to advocate
src/main before the 1.0 release.


 -Vincent
 
  
   Thanks
   -Vincent
  
  
  
 -
   To unsubscribe, e-mail: [EMAIL PROTECTED]
   For additional commands, e-mail: [EMAIL PROTECTED]
  --
  jvz.
  
  Jason van Zyl
  [EMAIL PROTECTED]
  http://tambora.zenplex.org
  
  In short, man creates for himself a new religion of a rational
  and technical order to justify his work and to be justified in it.
  
-- Jacques Ellul, The Technological Society
  
  
  -
  To unsubscribe, e-mail: [EMAIL PROTECTED]
  For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
-- 
jvz.

Jason van Zyl
[EMAIL PROTECTED]
http://tambora.zenplex.org

In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
  
  -- Jacques Ellul, The Technological Society


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: Why is the java source directory named main for plugins?

2003-06-19 Thread Michal Maczka
I also think it is bit inconsistent.

But think that the most consistent approach is

/ basedir
 main
 java
 resources
 aspects
 conf
 test
java
test-resources
...


Michal

P.S.

I am not saying we should change anything ...
  

 -Original Message-
 From: Vincent Massol [mailto:[EMAIL PROTECTED]
 Sent: Thursday, June 19, 2003 3:23 PM
 To: 'Maven Developers List'
 Subject: RE: Why is the java source directory named main for plugins?
 
 
 
 
  -Original Message-
  From: Jason van Zyl [mailto:[EMAIL PROTECTED]
  Sent: 19 June 2003 15:02
  To: Maven Developers List
  Subject: Re: Why is the java source directory named main for
 plugins?
  
  On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:
   Hi,
  
   Why is the java source directory named main for plugins (instead
 of
   java)?
  
  /src/test
  /src/main
  
  Seem to make more sense as a pattern as the testing code is also
 'java'
  code.
 
 Ok, my comment wasn't about whether the name made more sense or not
 about consistency. At present we use src/java everywhere else and
 everyone I know who uses maven also uses this convention. 
 
 In cvs we also src/java for Maven...
 
 -Vincent
 
  
   Thanks
   -Vincent
  
  
  
 -
   To unsubscribe, e-mail: [EMAIL PROTECTED]
   For additional commands, e-mail: [EMAIL PROTECTED]
  --
  jvz.
  
  Jason van Zyl
  [EMAIL PROTECTED]
  http://tambora.zenplex.org
  
  In short, man creates for himself a new religion of a rational
  and technical order to justify his work and to be justified in it.
  
-- Jacques Ellul, The Technological Society
  
  
  -
  To unsubscribe, e-mail: [EMAIL PROTECTED]
  For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 -
 Limit kredytowy nawet o 20% wyzszy, niz masz teraz.
 Sprawdz TSL+: http://link.interia.pl/f173e
 
 
 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: maven/src/plugins-build/war plugin.jelly

2003-06-19 Thread vmassol
vmassol 2003/06/19 07:01:51

  Modified:src/plugins-build/war plugin.jelly
  Log:
  fix comment
  
  Revision  ChangesPath
  1.19  +11 -17maven/src/plugins-build/war/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- plugin.jelly  17 Jun 2003 17:50:16 -  1.18
  +++ plugin.jelly  19 Jun 2003 14:01:51 -  1.19
  @@ -4,8 +4,7 @@
xmlns:license=license
xmlns:util=jelly:util
xmlns:ant=jelly:ant
  - xmlns:artifact=artifact
  - 
  + xmlns:artifact=artifact
   
 !--==--
 !-- Default goal : Builds a war file --
  @@ -161,13 +160,10 @@
artifact:install
   artifact=${maven.war.build.dir}/${maven.war.final.name}
   type=war
  -project=${pom}
  -/ 
  +project=${pom}/ 
 
 /goal
 
  -  
  -  
 !--==--
 !-- Install the snapshot version of the war in the local repository  --
 !--==--  
  @@ -178,40 +174,37 @@
 artifact:install-snapshot
   artifact=${maven.war.build.dir}/${maven.war.final.name}
   type=war
  -project=${pom}
  -/ 
  +project=${pom}/ 
   
 /goal
   
 !--==--
  -  !-- Deploys the war to  the local repository --
  +  !-- Deploys the war to the remote repository --
 !--==--  
 goal name=war:deploy 
   prereqs=war:war 
   description=Deploys the war to the remote repository
  +
artifact:deploy
   artifact=${maven.war.build.dir}/${maven.war.final.name}
   type=war
  -project=${pom}
  -/   
  +project=${pom}/   
   
 /goal  
   
 !--==--
  -  !-- Deploys the snapshoot of the war to  the remote repository   --
  +  !-- Deploys the snapshot of the war to the remote repository --
 !--==--  
  -
 goal name=war:deploy-snapshot 
   prereqs=war:war
   description=Deploys the snapshot version of  the war to remote 
repository  
  +
artifact:deploy-snapshot
   artifact=${maven.war.build.dir}/${maven.war.final.name}
   type=war
  -project=${pom}
  -/
  +project=${pom}/
  +
 /goal
  -  
  -  
   
 !--==--
 !-- Special no-op goal which can be used by other plugin which need  --
  @@ -219,4 +212,5 @@
 !-- temporary, until we get explicit plugin dependencies.--
 !--==--
 goal name=war:load/
  +
   /project
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: maven/src/plugins-build/jboss/xdocs changes.xml goals.xml

2003-06-19 Thread vmassol
vmassol 2003/06/19 07:06:20

  Modified:src/plugins-build/jboss plugin.jelly
   src/plugins-build/jboss/xdocs changes.xml goals.xml
  Log:
action dev=vmassol type=fix
  When generating the JBoss server configuration zip, exclude
  JBoss tmp and log directories from the zip.
/action
action dev=vmassol type=update
  Change strategy for bunding J2EE modules in the jboss server
  configuration. This is now achieved through dependencies in
  codeproject.xml/code. for any J2EE module you want to incude
  add a codejboss.bundle/code property in the said dependency
  definition.
/action
  
  Revision  ChangesPath
  1.9   +50 -58maven/src/plugins-build/jboss/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven/src/plugins-build/jboss/plugin.jelly,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- plugin.jelly  24 Apr 2003 10:01:27 -  1.8
  +++ plugin.jelly  19 Jun 2003 14:06:20 -  1.9
  @@ -7,10 +7,12 @@
 =
   --
   project 
  +  xmlns:ant=jelly:ant
 xmlns:j=jelly:core
 xmlns:util=jelly:util
 xmlns:jmx=jmx
  -  xmlns:define=jelly:define
  +  xmlns:define=jelly:define
  +  xmlns:artifact=artifact
   
 !--

  @@ -28,11 +30,18 @@
 --
 goal name=jboss:init
   
  -!-- Check if the maven.jboss.home mandatory property is set --
  -j:set var=jbosshomeX value=${maven.jboss.home}X/
  +!-- Check if the maven.jboss.home mandatory property is set and point
  + to a valid location --
  +ant:condition property=jbosshomepresent value=true
  +  ant:and
  +ant:isset property=maven.jboss.home/
  +ant:available file=${maven.jboss.home} type=dir/
  +  /ant:and 
  +/ant:condition
  +j:set var=jbosshomepresentX value=${jbosshomepresent}X/
   j:choose
  -  j:when test=${jbosshomeX == 'X'}
  -failYou need to set the maven.jboss.home property/fail
  +  j:when test=${jbosshomepresentX == 'X'}
  +failYou need to set the maven.jboss.home property and make it point to a 
valid location. It currently points to [${maven.jboss.home}]./fail
 /j:when
 j:otherwise
   echoUsing JBoss from ${maven.jboss.home} .../echo
  @@ -50,7 +59,8 @@
   
 !--

  -   Creates a custom JBoss server configuration directory structure.
  +   Creates a custom JBoss server configuration directory structure
  +   (with no J2EE modules deployed).

 --
 goal name=jboss:configure 
  @@ -112,79 +122,61 @@
   
 !--

  -   Generates the zipped distributable. This goal is called automatically
  -   by the jboss:package-* goals.
  +   Package J2EE modules in the custom JBoss server configuration 
  +   directory structure.

 --
  -  goal name=jboss:dist
  -
  -!-- Generate the distributable --
  -zip destfile=${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.zip
  -  zipfileset dir=${maven.jboss.build.dir}/${maven.jboss.conf.name} 
  -prefix=${maven.jboss.conf.name}/
  -/zip
  -
  -  /goal
  -
  -  !--
  - 
  -   Creates a custom JBoss server configuration directory structure,
  -   packaging an EAR in it.
  - 
  -  --
  -  goal name=jboss:package-ear 
  -description=Creates a specific JBoss server configuration (with EAR)
  -prereqs=jboss:init,ear:ear,jboss:configure
  -
  -!-- Copy the EAR to install to the JBoss deploy dir. --
  -copy file=${maven.build.dir}/${maven.final.name}.ear
  -  todir=${maven.jboss.build.deploy.dir}/
  +  goal name=jboss:package 
  +description=Creates a specific JBoss server configuration
  +prereqs=jboss:init,jboss:configure
   
  -attainGoal name=jboss:dist/
  +j:forEach var=dep items=${pom.dependencies}
  +  j:if test=${dep.getProperty('jboss.bundle')=='true'}
  +ant:echoBundling: (${dep.groupId}, ${dep.artifactId}, 
${dep.type})/ant:echo
  +
  +!-- TODO: Use getDependencyPath() once it supports artifacts other 
  +  than jars --
  +copy todir=${maven.jboss.build.deploy.dir}
  +  
file=${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}/
  +  /j:if

Re: Why is the java source directory named main for plugins?

2003-06-19 Thread Ben Walding
That's my preference also.   And it also makes it look like you can have 
multiple build trees, yet not! Muahahaha... I demand more emails on the 
user list dammit!

Michal Maczka wrote:

I also think it is bit inconsistent.

But think that the most consistent approach is

/ basedir
main
java
resources
aspects
conf
test
   java
   test-resources
   ...
Michal

P.S.

I am not saying we should change anything ...
 

 

-Original Message-
From: Vincent Massol [mailto:[EMAIL PROTECTED]
Sent: Thursday, June 19, 2003 3:23 PM
To: 'Maven Developers List'
Subject: RE: Why is the java source directory named main for plugins?


   

-Original Message-
From: Jason van Zyl [mailto:[EMAIL PROTECTED]
Sent: 19 June 2003 15:02
To: Maven Developers List
Subject: Re: Why is the java source directory named main for
 

plugins?
   

On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:
 

Hi,

Why is the java source directory named main for plugins (instead
   

of
   

java)?
   

/src/test
/src/main
Seem to make more sense as a pattern as the testing code is also
 

'java'
   

code.
 

Ok, my comment wasn't about whether the name made more sense or not
about consistency. At present we use src/java everywhere else and
everyone I know who uses maven also uses this convention. 

In cvs we also src/java for Maven...

-Vincent

   

Thanks
-Vincent


   

-
   

To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
   

--
jvz.
Jason van Zyl
[EMAIL PROTECTED]
http://tambora.zenplex.org
In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
 -- Jacques Ellul, The Technological Society

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
Limit kredytowy nawet o 20% wyzszy, niz masz teraz.
Sprawdz TSL+: http://link.interia.pl/f173e


   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: Why is the java source directory named main for plugins?

2003-06-19 Thread Juergen Heidak
I like the idea of adding more structural information to the directory 
layout but all changes should be backward compatible because many 
projects already use maven and can not adapt a possible new structure 
without great  effort.

In other words: The path to the different source directories (java, 
test, ...) should be configurable by properties :-)

Regards Juergen

Ben Walding wrote:

That's my preference also.   And it also makes it look like you can 
have multiple build trees, yet not! Muahahaha... I demand more emails 
on the user list dammit!

Michal Maczka wrote:

I also think it is bit inconsistent.

But think that the most consistent approach is

/ basedir
main
java
resources
aspects
conf
test
   java
   test-resources
   ...
Michal

P.S.

I am not saying we should change anything ...
 

 

-Original Message-
From: Vincent Massol [mailto:[EMAIL PROTECTED]
Sent: Thursday, June 19, 2003 3:23 PM
To: 'Maven Developers List'
Subject: RE: Why is the java source directory named main for plugins?


  

-Original Message-
From: Jason van Zyl [mailto:[EMAIL PROTECTED]
Sent: 19 June 2003 15:02
To: Maven Developers List
Subject: Re: Why is the java source directory named main for

plugins?
  

On Thu, 2003-06-19 at 06:32, Vincent Massol wrote:


Hi,

Why is the java source directory named main for plugins (instead
  

of
  

java)?
  
/src/test
/src/main
Seem to make more sense as a pattern as the testing code is also

'java'
  

code.

Ok, my comment wasn't about whether the name made more sense or not
about consistency. At present we use src/java everywhere else and
everyone I know who uses maven also uses this convention.
In cvs we also src/java for Maven...
-Vincent

  



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: Why is the java source directory named main for plugins?

2003-06-19 Thread Juergen Heidak
Wow you're very fast I just sent the mail an already got an answer :-))

I know that  the source directories are configurable at the moment I 
just wanted to make sure that this will also be the case in the future 
(after eventually changes to the directory layout) because changing the 
layout of a project is impossible if the project has reached a critical 
size.

Juergen

bob mcwhirter wrote:

On Thu, 19 Jun 2003, Juergen Heidak wrote:

 

I like the idea of adding more structural information to the directory 
layout but all changes should be backward compatible because many 
projects already use maven and can not adapt a possible new structure 
without great  effort.

In other words: The path to the different source directories (java, 
test, ...) should be configurable by properties :-)
   

I't's already configurable in project.xml.  I've personally been
using src/java/main/ and src/java/test/ since the beginning.
	-bob
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


cvs commit: maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy DeployRequest.java DeployTool.java

2003-06-19 Thread michal
michal  2003/06/19 15:02:37

  Modified:src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers
FtpDeployer.java FileDeployer.java
   src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer
DefaultArtifactDeployer.java
MavenDeployRequest.java
   src/plugins-build/artifact/src/main/org/apache/maven/deploy
DeployRequest.java DeployTool.java
  Log:
  FTP, FILE deployers work. ssh(scp) on the way
  
  Revision  ChangesPath
  1.2   +4 -4  
maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java
  
  Index: FtpDeployer.java
  ===
  RCS file: 
/home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FtpDeployer.java  17 Jun 2003 22:05:59 -  1.1
  +++ FtpDeployer.java  19 Jun 2003 22:02:36 -  1.2
  @@ -91,8 +91,7 @@
   {
   String username = request.getUser();
   String password = request.getPass();
  -String host = request.getHost();
  -
  +String host = request.getHost();  
   
   FTPClient ftp = new FTPClient();
   
  @@ -142,7 +141,8 @@
   
   __main : try
   {
  -if (ftp.login(username, password) == false)
  +System.out.println(username: ' + username +' password: '+  
password+');
  +if (ftp.login(username.trim(), password.trim()) == false)
   {
   ftp.logout();
   break __main;
  
  
  
  1.2   +18 -8 
maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java
  
  Index: FileDeployer.java
  ===
  RCS file: 
/home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileDeployer.java 17 Jun 2003 22:05:59 -  1.1
  +++ FileDeployer.java 19 Jun 2003 22:02:36 -  1.2
  @@ -63,7 +63,6 @@
   import org.apache.maven.deploy.DeployRequest;
   import org.apache.maven.deploy.exceptions.DeployException;
   
  -
   /**
* 
* @author a href=[EMAIL PROTECTED]Michal Maczka/a 
  @@ -76,16 +75,27 @@
* @see org.apache.maven.fetch.fetchers.Fetcher#fetchUrl(java.lang.String, 
java.io.OutputStream)
*/
   public void deploy(DeployRequest request) throws DeployException
  -{
  +{
   try
   {
  -File inputFile = new File( request.getInputFile() );
  -File outputFile = new File( request.getOutputDir(), 
request.getOutputFile());
  +File inputFile = new File(request.getInputFile());
  +
  +File outputFile =
  +new File(request.getHost(), request.getOutputDir());
  +
  +if (! outputFile.exists())
  +{
  +   outputFile.mkdirs();
  +}
  +outputFile = new File(  outputFile, request.getOutputFile());
  +System.out.println(Copining from:  + inputFile +  to:  + 
outputFile);
  +
  +
   FileUtils.copyFile(inputFile, outputFile);
   }
   catch (IOException e)
   {
  -   throw new DeployException(Cannot copy file:  + e.getMessage());
  -}   
  -}
  +throw new DeployException(Cannot copy file:  + e.getMessage());
  +}
  +}
   }
  
  
  
  1.4   +20 -9 
maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
  
  Index: DefaultArtifactDeployer.java
  ===
  RCS file: 
/home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultArtifactDeployer.java  19 Jun 2003 10:52:25 -  1.3
  +++ DefaultArtifactDeployer.java  19 Jun 2003 22:02:37 -  1.4
  @@ -205,35 +205,45 @@
   // trick add special values to context for default repository;
   
   String repos =
  -(String) project.getContext().getVariable(maven.deploy.repos);
  +(String) project.getContext().getVariable(maven.repo.repos);
  +
  +System.out.println( repos: + repos );
   
   String distSite = project.getDistributionSite();
   if (distSite != null  distSite.length()  0)
   {
   project.getContext().setVariable(
  -maven.deploy.repo.central,
  +

Re: RFC: Deployer properties

2003-06-19 Thread Brett Porter
Looks good. A few questions:

maven.repo.repo1.remote.group= goo
Is remote.group really needed? How is this different to pom.groupId?

maven.deploy.repo.ibiblio = http://www.ibiblio.org
maven.deploy.repo.ibiblio.directory = /maven
Is the extra deploy here a typo? If it is something different, what is 
it? (looks like maven.repo.remote). If it is the same, how do you deploy 
to HTTP? PUT?



etc.

For each repository following properties can be set ( I hope that names are
selfexplaing):
maven.repo.${repo alias}.dir = /repository
maven.repo.${repo alias}.username= foo
maven.repo.${repo alias}.password= baa
maven.repo.${repo alias}.remote.group= goo
maven.repo.${repo alias}.port= 23
maven.repo.${repo alias}.privatekey= ./ssh/keys/somefile
maven.repo.${repo alias}.passphrase= baa
maven.repo.${repo alias}.method=(scp|rsync|ftp|put|cp)

maven.repo.proxy=192.168.2.15
maven.repo.proxy.username= foo
maven.repo.proxy.password= foo
maven.repo.proxy.port= 81
You should only need the one proxy, I'd stick with maven.proxy.* that 
already exist.


There is one special case:

In POM (project.xml) we have
 ...
  siteAddressmaven.apache.org/siteAddress
  siteDirectory/www/maven.apache.org//siteDirectory
 ...
In this case properties for this repository can be set

using alias central

so e.g.

maven.repo.central.username= foo
maven.repo.central.privatekey= ./ssh/keys/somefile
Maybe this special case doesn't belong in the POM?

One other thing about deploying - will an MD5 be sent as well? Will it 
only be sent to a central repository that can be trusted, or do they 
exist on mirrors as well? (ie for download integrity checks, not 
security checks).

Finally, some more thoughts although a bit of a tangent - pulling them 
back down. Can the repo aliases be re-used for pulling down artifacts? 
Although we might want to stick to just HTTP/FTP there. And would some 
projects perhaps want to identify their own repos in their POM? Does 
that pose a security problem?

Cheers,
Brett
--
Web Developer
f2 network ~ everything essential
02 8596 4437
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


cvs commit: maven project.xml

2003-06-19 Thread jvanzyl
jvanzyl 2003/06/19 16:25:42

  Modified:.project.xml
  Log:
  o Updating the deps for the new marshaller/unmarshaller for the POM. Hopefully
I can hand some stuff over to Ben :-)
  
  Revision  ChangesPath
  1.279 +37 -7 maven/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/maven/project.xml,v
  retrieving revision 1.278
  retrieving revision 1.279
  diff -u -r1.278 -r1.279
  --- project.xml   13 Jun 2003 12:25:50 -  1.278
  +++ project.xml   19 Jun 2003 23:25:42 -  1.279
  @@ -208,7 +208,7 @@
 timezone+1/timezone
   /developer
   developer
  -  nameStéphane Mor/name
  +  nameSt�phane Mor/name
 idsmor/id
 email[EMAIL PROTECTED]/email
 organization/organization
  @@ -433,7 +433,7 @@
   /dependency
   dependency
 idwerkz/id
  -  version1.0-beta-9/version
  +  version1.0-beta-10/version
 urlhttp://werkz.sourceforge.net//url
   /dependency
   !-- Runtime dependencies --
  @@ -504,11 +504,41 @@
 version2.2.1/version
 urlhttp://xml.apache.org/xerces2-j//url
   /dependency
  +
  +dependency
  +  groupIdxpp3/groupId
  +  artifactIdxpp3/artifactId
  +  version1.1.2a/version
  +/dependency
  +
  +!--
  +
  +dependency
  +  groupIdaspectj/groupId
  +  artifactIdaspectjrt/artifactId
  +  version1.1.0/version
  +/dependency
  +
  +dependency
  +  groupIdaspectj/groupId
  +  artifactIdaspectjtools/artifactId
  +  version1.1.0/version
  +/dependency
  +
  +--
  +
  +dependency
  +  groupIdplexus/groupId
  +  artifactIdplexus/artifactId
  +  version0.6/version
  +/dependency
  +
 /dependencies
 build
   nagEmailAddress[EMAIL PROTECTED]/nagEmailAddress
  -sourceDirectorysrc/java/sourceDirectory
  -unitTestSourceDirectorysrc/test/java/unitTestSourceDirectory
  +sourceDirectory${basedir}/src/java/sourceDirectory
  +unitTestSourceDirectory${basedir}/src/test/java/unitTestSourceDirectory
  +aspectSourceDirectory${basedir}/src/aspect/aspectSourceDirectory
   unitTest
 includes
   include**/*Test.java/include
  @@ -520,7 +550,7 @@
   /unitTest
   resources
 resource
  -directorysrc/conf/directory
  +directory${basedir}/src/conf/directory
   includes
 include*.xsd/include
 include*.dtd/include
  @@ -530,7 +560,7 @@
   /includes
 /resource
 resource
  -directorysrc/messages/directory
  +directory${basedir}/src/messages/directory
   targetPathorg/apache/maven/messages/targetPath
   includes
 includemessages*.properties/include
  @@ -563,7 +593,7 @@
   reportmaven-tasklist-plugin/report
   reportmaven-jellydoc-plugin/report
 /reports
  -  
  +
 !-- For maven internal testing --
   
 properties
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: maven/src/java/org/apache/maven DefaultProjectMarshaller.java

2003-06-19 Thread jvanzyl
jvanzyl 2003/06/19 16:26:08

  Added:   src/java/org/apache/maven DefaultProjectMarshaller.java
  Log:
  o New POM marshaller.
  
  Revision  ChangesPath
  1.1  maven/src/java/org/apache/maven/DefaultProjectMarshaller.java
  
  Index: DefaultProjectMarshaller.java
  ===
  package org.apache.maven;
  
  import org.apache.maven.project.Build;
  import org.apache.maven.project.Contributor;
  import org.apache.maven.project.Dependency;
  import org.apache.maven.project.Developer;
  import org.apache.maven.project.License;
  import org.apache.maven.project.MailingList;
  import org.apache.maven.project.Project;
  import org.apache.maven.project.Resource;
  import org.apache.maven.project.SourceModification;
  import org.apache.maven.project.Version;
  import org.xmlpull.v1.XmlPullParserFactory;
  import org.xmlpull.v1.XmlSerializer;
  
  import java.io.IOException;
  import java.io.Writer;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
  import java.util.SortedSet;
  
  /**
   * @author a href=mailto:[EMAIL PROTECTED]Gilles Dodinet/a
   * @version $Id: DefaultProjectMarshaller.java,v 1.4 2003/05/20 21:42:57
   *  gdodinet Exp $
   */
  public class DefaultProjectMarshaller
  {
  private final static String NAMESPACE = null;
  private final static String ENCODING = null;
  private final static Boolean STANDALONE = null;
  private XmlSerializer serializer;
  private static String INDENTATION =   ;
  private static String LS = System.getProperty( line.separator );
  
  /**
   * Constructor for the DefaultProjectMarshaller object
   *
   * @exception Exception
   */
  public DefaultProjectMarshaller()
  throws Exception
  {
  XmlPullParserFactory factory = XmlPullParserFactory.newInstance(
  System.getProperty( XmlPullParserFactory.PROPERTY_NAME ), null );
  
  serializer = factory.newSerializer();
  }
  
  /**
   * Description of the Method
   */
  private void initialize( Writer writer )
  throws IOException
  {
  serializer.setProperty( 
http://xmlpull.org/v1/doc/properties.html#serializer-indentation;, INDENTATION );
  serializer.setProperty( 
http://xmlpull.org/v1/doc/properties.html#serializer-line-separator;, LS );
  serializer.setOutput( writer );
  //serializer.startDocument(ENCODING, STANDALONE);
  }
  
  /**
   * Description of the Method
   */
  public void marshall( Writer pom, Project project )
  throws Exception
  {
  initialize( pom );
  
  serializer.startTag( NAMESPACE, project );
  
  marshallString( project.getExtend(), extend );
  marshallString( project.getPomVersion(), pomVersion );
  
  // We need to make sure the legacy id comes out.
  marshallRequiredString( Project.standardToLegacyId( project.getId() ), id 
);
  marshallRequiredString( project.getName(), name );
  
  marshallString( project.getGroupId(), groupId );
  marshallString( project.getArtifactId(), artifactId );
  
  marshallRequiredString( project.getCurrentVersion(), currentVersion );
  
  marshallOrganization( project );
  
  marshallString( project.getInceptionYear(), inceptionYear );
  marshallString( project.getPackage(), package );
  marshallString( project.getLogo(), logo );
  marshallString( project.getGumpRepositoryId(), gumpRepositoryId );
  
  marshallString( project.getDescription(), description );
  
  marshallRequiredString( project.getShortDescription(), shortDescription );
  
  marshallString( project.getUrl(), url );
  marshallString( project.getIssueTrackingUrl(), issueTrackingUrl );
  marshallString( project.getSiteAddress(), siteAddress );
  marshallString( project.getSiteDirectory(), siteDirectory );
  marshallString( project.getDistributionDirectory(), distributionDirectory 
);
  
  marshallRepository( project );
  marshallVersions( project );
  
  marshallMailingLists( project );
  marshallDevelopers( project );
  marshallContributors( project );
  marshallLicenses( project );
  marshallDependencies( project );
  marshallBuild( project );
  marshallReports( project );
  
  marshallProperties( project.getProperties() );
  
  serializer.endTag( NAMESPACE, project );
  serializer.endDocument();
  }
  
  /**
   * Description of the Method
   */
  private void marshallOrganization( Project project )
  throws Exception
  {
  if ( project.getOrganization() != null )
  {
  serializer.startTag( NAMESPACE, organization );
  
  marshallRequiredString( 

cvs commit: maven/src/java/org/apache/maven DefaultProjectUnmarshaller.java

2003-06-19 Thread jvanzyl
jvanzyl 2003/06/19 16:26:22

  Added:   src/java/org/apache/maven DefaultProjectUnmarshaller.java
  Log:
  o New POM unmarshaller.
  
  Revision  ChangesPath
  1.1  maven/src/java/org/apache/maven/DefaultProjectUnmarshaller.java
  
  Index: DefaultProjectUnmarshaller.java
  ===
  package org.apache.maven;
  
  import org.apache.maven.project.Build;
  import org.apache.maven.project.Contributor;
  import org.apache.maven.project.Dependency;
  import org.apache.maven.project.Developer;
  import org.apache.maven.project.MailingList;
  import org.apache.maven.project.Organization;
  import org.apache.maven.project.Project;
  import org.apache.maven.project.Repository;
  import org.apache.maven.project.Resource;
  import org.apache.maven.project.UnitTest;
  import org.apache.maven.project.Version;
  import org.apache.maven.project.SourceModification;
  import org.xmlpull.v1.XmlPullParser;
  import org.xmlpull.v1.XmlPullParserException;
  import org.xmlpull.v1.XmlPullParserFactory;
  
  import java.io.IOException;
  import java.io.Reader;
  import java.util.Map;
  import java.util.HashMap;
  
  /**
   * @author Jason van Zyl
   * @version $Id: DefaultProjectUnmarshaller.java,v 1.1 2003/06/19 23:26:22 jvanzyl 
Exp $
   */
  public class DefaultProjectUnmarshaller
  {
  public Project parse( Reader reader )
  throws Exception
  {
  Project project = new Project();
  
  XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
  XmlPullParser parser = factory.newPullParser();
  parser.setInput( reader );
  
  int eventType = parser.getEventType();
  
  while ( eventType != XmlPullParser.END_DOCUMENT )
  {
  if ( eventType == XmlPullParser.START_TAG )
  {
  if ( parser.getName().equals( extend ) )
  {
  project.setExtend( parser.nextText() );
  }
  else if ( parser.getName().equals( pomVersion ) )
  {
  project.setPomVersion( parser.nextText() );
  }
  else if ( parser.getName().equals( groupId ) )
  {
  project.setGroupId( parser.nextText() );
  }
  else if ( parser.getName().equals( artifactId ) )
  {
  project.setArtifactId( parser.nextText() );
  }
  else if ( parser.getName().equals( id ) )
  {
  project.setId( parser.nextText() );
  }
  else if ( parser.getName().equals( name ) )
  {
  project.setName( parser.nextText() );
  }
  else if ( parser.getName().equals( currentVersion ) )
  {
  project.setCurrentVersion( parser.nextText() );
  }
  else if ( parser.getName().equals( inceptionYear ) )
  {
  project.setInceptionYear( parser.nextText() );
  }
  else if ( parser.getName().equals( package ) )
  {
  project.setPackage( parser.nextText() );
  }
  else if ( parser.getName().equals( gumpRepositoryId ) )
  {
  project.setGumpRepositoryId( parser.nextText() );
  }
  else if ( parser.getName().equals( description ) )
  {
  project.setDescription( parser.nextText() );
  }
  else if ( parser.getName().equals( shortDescription ) )
  {
  project.setShortDescription( parser.nextText() );
  }
  else if ( parser.getName().equals( url ) )
  {
  project.setUrl( parser.nextText() );
  }
  else if ( parser.getName().equals( issueTrackingUrl ) )
  {
  project.setIssueTrackingUrl( parser.nextText() );
  }
  else if ( parser.getName().equals( siteAddress ) )
  {
  project.setSiteAddress( parser.nextText() );
  }
  else if ( parser.getName().equals( siteDirectory ) )
  {
  project.setSiteDirectory( parser.nextText() );
  }
  else if ( parser.getName().equals( distributionDirectory ) )
  {
  project.setDistributionDirectory( parser.nextText() );
  }
  else if ( parser.getName().equals( organization ) )
  {
  project.setOrganization( new 

Re: JBoss plugin - new modifications

2003-06-19 Thread James CE Johnson

   

BTW: Are you going to make jboss plugin compatible with jboss 3.2x
   

series?

What is not compatible? I seem to remember I have used it with JBoss
3.2.1.
 

   

maven.jboss.jmx.url.deploy=http://${maven.jboss.hostname}:${maven.jboss.
po
 

rt
}/jmx-
console/HtmlAdaptor?action=invokeOpname=jboss.system:service%3DMainDe
ployermethodIndex=19arg0=
   

maven.jboss.jmx.url.undeploy=http://${maven.jboss.hostname}:${maven.jbos
s.
 

po
rt}/jmx-
console/HtmlAdaptor?action=invokeOpname=jboss.system:service%3DMain
DeployermethodIndex=2arg0=
Perhaps there should be a maven.jboss.version property and a j:if tag 
would check that in order to invoke the right JMX thing. I seem to 
recall that the url was something different before we upgraded to 3.0.x...

j:if test=${maven.jboss.version == '3.0.x'}
 the stuff we have now...
/j:if
j:if test=${maven.jboss.version == '3.2.x'}
 whatever is appropriate for 3.2.x...
/j:if
 


   

ok, I haven't used those JMX deployments yet. The rest works with JBoss
3.2.x (the static deployment part).
Would you have a patch for the JMX stuff :-) ?

Thanks
-Vincent


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: RFC: Deployer properties

2003-06-19 Thread dion
Michal Maczka [EMAIL PROTECTED] wrote on 19/06/2003 10:48:48 PM:

 Please comment this:
 
 
 With new deployer API I am going to support deployment to many remote
 repositories.
 In reality many = 2 in most of the cases. But 21 ..
 
 I am proposing to use following properties:
 
 #the list of repositories. repo1, repo2 are aliases or nicknames of
 repositories
 maven.deploy.repos = repo1, repo2, ibiblio
What's the difference between deploy.repos and remote.repos. Shouldn't we 
stick with remote as it's already being used?

 (I think individual settings for each repository can be shared between
 deployer and fetch)
 
 
 maven.repo.repo1= ftp://www.foo.com
 maven.repo.repo1.dir = /repository
 maven.repo.repo1.username= foo
 maven.repo.repo1.password= baa
 maven.repo.repo1.remote.group= goo
 
 maven.repo.repo2 = file:///c:/temp
 maven.repo.repo2.directory = /repository
 
 maven.deploy.repo.ibiblio = http://www.ibiblio.org
 maven.deploy.repo.ibiblio.directory = /maven
Ditto.

 For each repository following properties can be set ( I hope that names 
are
 selfexplaing):
 
 
 maven.repo.${repo alias}.dir = /repository
 maven.repo.${repo alias}.username= foo
 maven.repo.${repo alias}.password= baa
 maven.repo.${repo alias}.remote.group= goo
 maven.repo.${repo alias}.port= 23
 maven.repo.${repo alias}.privatekey= ./ssh/keys/somefile
 maven.repo.${repo alias}.passphrase= baa
 maven.repo.proxy=192.168.2.15
 maven.repo.proxy.username= foo
 maven.repo.proxy.password= foo
 maven.repo.proxy.port= 81
Arent the set of properties that can be set deployer-specific, e.g. ssh 
deployer needs stuff that filesystem deployer doesn't?

 
 
 
 There is one special case:
 
 In POM (project.xml) we have
  ...
   siteAddressmaven.apache.org/siteAddress
   siteDirectory/www/maven.apache.org//siteDirectory
This is the web site address and directory, not a repo???

 
 In this case properties for this repository can be set
 
 using alias central
 
 so e.g.
 
 maven.repo.central.username= foo
 maven.repo.central.privatekey= ./ssh/keys/somefile
Isn't the central repo the 'main' remote one?

--
dIon Gillard, Multitask Consulting
Blog:  http://blogs.codehaus.org/people/dion/
Work:  http://www.multitask.com.au




Re: cvs commit: maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployerDefaultArtifactDeployer.java MavenDeployRequest.java

2003-06-19 Thread dion
Shouldn't the  maven.deploy. at least be a constant somewhere?
--
dIon Gillard, Multitask Consulting
Blog:  http://blogs.codehaus.org/people/dion/
Work:  http://www.multitask.com.au


[EMAIL PROTECTED] wrote on 19/06/2003 08:52:26 PM:

 michal  2003/06/19 03:52:25
 
   Modified:src/plugins-
 build/artifact/src/main/org/apache/maven/artifact/deployer
 DefaultArtifactDeployer.java
 MavenDeployRequest.java
   Log:
   Install goal fixed
 
   Revision  ChangesPath
   1.3   +22 -12maven/src/plugins-
 
build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.
 java
 
   Index: DefaultArtifactDeployer.java
   ===
   RCS file: /home/cvs/maven/src/plugins-
 
build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.
 java,v
   retrieving revision 1.2
   retrieving revision 1.3
   diff -u -r1.2 -r1.3
   --- DefaultArtifactDeployer.java   17 Jun 2003 22:06:00 -   1.2
   +++ DefaultArtifactDeployer.java   19 Jun 2003 10:52:25 -   1.3
   @@ -142,7 +142,7 @@
}
 
/**
   - * Istall given file in repsoitory 
   + * Install given file in local repsoitory 
 * @param artifact the artifact file to insatall 
 * @param type The type of the artiafct
 * @param project 
   @@ -156,22 +156,32 @@
String version)
throws MavenException
{
   -String repositoryPath = getRepositoryPath(type, project, 
version);
   +
try
   -{
   -String dest = getLocalRepository(project) + / + 
 repositoryPath;
   +{ 
   +File file =
   +new File(
   +getLocalRepository(project),
   +getRepositoryPath(type, project, version));
   +
   +if (!file.exists())
   +{
   +file.mkdirs();
   +}
   +file = new File(file, getRepositoryFile(type, 
 project, version));
System.out.println(
   -Copying: from ' + artifact + ' to: ' + dest + 
');
   -FileUtils.copyFile(new File(artifact), new File(dest));
   +Copying: from ' + artifact + ' to: ' + file + 
');
   +FileUtils.copyFile(new File(artifact), file);
   +
}
catch (IOException e)
{
String msg =
Cannot install file: '
   -+ repositoryPath
   ++ artifact
+ '. Reason: 
+ e.getMessage();
   -throw new MavenException(msg);
   +throw new MavenException(msg, e);
}
 
}
   @@ -201,13 +211,13 @@
if (distSite != null  distSite.length()  0)
{
project.getContext().setVariable(
   -maven.deploy.default.url,
   +maven.deploy.repo.central,
project.getDistributionSite());
project.getContext().setVariable(
   -maven.deploy.default.dir,
   +maven.deploy.repo.central.directory,
project.getDistributionDirectory());
 
   -repos = default,  + repos;
   +repos = central,  + repos;
}
 
String repositoryPath = getRepositoryPath(type, project, 
version);
 
 
 
   1.2   +17 -11maven/src/plugins-
 
build/artifact/src/main/org/apache/maven/artifact/deployer/MavenDeployRequest.
 java
 
   Index: MavenDeployRequest.java
   ===
   RCS file: /home/cvs/maven/src/plugins-
 
build/artifact/src/main/org/apache/maven/artifact/deployer/MavenDeployRequest.
 java,v
   retrieving revision 1.1
   retrieving revision 1.2
   diff -u -r1.1 -r1.2
   --- MavenDeployRequest.java   17 Jun 2003 22:06:00 -   1.1
   +++ MavenDeployRequest.java   19 Jun 2003 10:52:25 -   1.2
   @@ -88,44 +88,49 @@
super();
String username =
(String) project.getContext().getVariable(
   -maven.deploy. + repository + .username);
   +maven.deploy.repo. + repository + .username);
 
System.out.println(repository +  username: + username);
String password =
(String) project.getContext().getVariable(
   -maven.deploy. + repository + .password);
   +maven.deploy.repo. + repository + .password);
 
System.out.println(repository +  password: ' + password + 
');
 
String passphrase =
(String) project.getContext().getVariable(
   -maven.deploy. + repository + .passphrase);
   +maven.deploy.repo. + repository + .passphrase);
 
String privateKey =
(String) 

[jira] Created: (MAVEN-506) upload castor xml 0.9.5 to repo

2003-06-19 Thread jira
Message:

  A new issue has been created in JIRA.

-
View the issue:

  http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-506


Here is an overview of the issue:
-
Key: MAVEN-506
Summary: upload castor xml 0.9.5 to repo
   Type: Wish

 Status: Unassigned
   Priority: Minor

 Time Spent: Unknown
   Estimate: 0 minutes

Project: maven
 Components: 
 Repo Jar Requests
   Versions:
 1.0-beta-10

   Assignee: 
   Reporter: Simon Lau

Created: Thu, 19 Jun 2003 11:48 PM
Updated: Thu, 19 Jun 2003 11:48 PM

Description:
This can be found at http://castor.exolab.org/download.html


-
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.codehaus.org/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]