cvs commit: maven/src/plugins-build/ear plugin.jelly
dion2003/09/24 21:19:48
Modified:src/plugins-build/ear plugin.jelly
Log:
Fix for MAVEN-746.
Allows arbitrary bundling of files into an EAR.
Keeping a list of jar, war, ear, rar etc is getting ridiculous.
If the user puts ear.bundle to true, it goes in.
Revision ChangesPath
1.14 +4 -31 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 25 Jul 2003 14:59:16 - 1.13
+++ plugin.jelly 25 Sep 2003 04:19:48 - 1.14
@@ -54,41 +54,14 @@
j:if test=${dep.getProperty('ear.bundle')=='true'}
!--
-
We know that this dep wants to be bundled.
- We should bundle only jars, wars and ejbs
-
- --
-
- !-- I want to have
- j:if test=${dep.type == 'jar' or dep.type == 'war' or dep.type ==
'ejb'}
- but jexl sucks so I have to write extra 10 lines...
--
-
- j:set var=bundle value=false/
- j:if test=${dep.type == 'jar'}
-j:set var=bundle value=true/
- /j:if
- j:if test=${dep.type == 'war'}
-j:set var=bundle value=true/
- /j:if
-
- j:if test=${dep.type == 'ejb'}
-j:set var=bundle value=true/
- /j:if
-
- j:if test=${dep.type == 'rar'}
-j:set var=bundle value=true/
- /j:if
-
- j:if test=${bundle}
-ant:echoBundling: ${dep.type} - ${dep.id}/ant:echo
- ant:fileset dir=${lib.file.parent}
- ant:include name=${lib.file.name}/
-/ant:fileset
+ ant:echoBundling: ${dep.type} - ${dep.id}/ant:echo
+ ant:fileset dir=${lib.file.parent}
+ant:include name=${lib.file.name}/
+ /ant:fileset
- /j:if
/j:if
/j:forEach
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/ear plugin.jelly plugin.properties
bwalding2003/07/25 07:59:16
Modified:src/plugins-build/ear/xdocs properties.xml
src/plugins-build/ear plugin.jelly plugin.properties
Log:
Ensure ear files are correctly versioned for validating j2ee containers.
PR: MAVEN-613
Submitted by: Thomas Christensen
Revision ChangesPath
1.7 +10 -0 maven/src/plugins-build/ear/xdocs/properties.xml
Index: properties.xml
===
RCS file: /home/cvs/maven/src/plugins-build/ear/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties.xml15 Jul 2003 19:05:12 - 1.6
+++ properties.xml25 Jul 2003 14:59:16 - 1.7
@@ -43,6 +43,16 @@
/td
/tr
tr
+ tdmaven.ear.appxml.version/td
+ tdYes/td
+ td
+Inserts the doctype header depending on the specified version. Default
is 1.3
+ /td
+ td
+false
+ /td
+/tr
+tr
tdmaven.ear.displayname/td
tdYes/td
td
1.13 +11 -1 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 15 Jul 2003 19:05:12 - 1.12
+++ plugin.jelly 25 Jul 2003 14:59:16 - 1.13
@@ -131,13 +131,23 @@
!--==--
goal name=ear:generate-ear-descriptor description=Generates the ear
descriptor
- ant:echoGenerating appxml file:${maven.ear.appxml}/ant:echo
+ ant:echoGenerating appxml file:${maven.ear.appxml} version
${maven.ear.appxml.version}/ant:echo
j:file name=${maven.ear.appxml}
outputMode=xml
prettyPrint=true
encoding=UTF-8
+
+j:switch on=${maven.ear.appxml.version}
+ j:case value=1.3
+ x:doctype name=application publicId=-//Sun Microsystems,
Inc.//DTD J2EE Application 1.3//EN
systemId=http://java.sun.com/dtd/application_1_3.dtd/
+ /j:case
+ j:default
+ x:doctype name=application publicId=-//Sun Microsystems,
Inc.//DTD J2EE Application 1.2//EN
systemId=http://java.sun.com/j2ee/dtds/application_1_2.dtd/
+ /j:default
+/j:switch
+
x:element name=application
x:element name=display-name${maven.ear.displayname}/x:element
j:forEach var=lib items=${pom.artifacts}
1.3 +1 -0 maven/src/plugins-build/ear/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 8 May 2003 20:53:55 - 1.2
+++ plugin.properties 25 Jul 2003 14:59:16 - 1.3
@@ -11,3 +11,4 @@
maven.ear.manifest=${maven.ear.descriptordir}/MANIFEST.MF
maven.ear.appxml.generate=false
maven.ear.displayname=${pom.id}
+maven.ear.appxml.version=1.3
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/ear plugin.jelly
michal 2003/07/15 12:05:12
Modified:src/plugins-build/ear/xdocs properties.xml
src/plugins-build/ear plugin.jelly
Log:
Just changed my mind about the name of one of the properties.
Still think that 'ear.appxml.war.context-root' is way to lng.
Revision ChangesPath
1.6 +1 -1 maven/src/plugins-build/ear/xdocs/properties.xml
Index: properties.xml
===
RCS file: /home/cvs/maven/src/plugins-build/ear/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml15 Jul 2003 19:00:18 - 1.5
+++ properties.xml15 Jul 2003 19:05:12 - 1.6
@@ -110,7 +110,7 @@
typewartype
properties
ear.bundletrue/ear.bundle
-ear.appxml.ear.context-rootwebapp/ear.appxml.ear.context-root
+ear.appxml.war.context-rootwebapp/ear.appxml.war.context-root
/properties
/dependency
]]/source
1.12 +1 -1 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 10 Jul 2003 21:43:44 - 1.11
+++ plugin.jelly 15 Jul 2003 19:05:12 - 1.12
@@ -148,7 +148,7 @@
x:element name=module
x:element name=web
x:element name=web-uri${dep.getArtifact()}/x:element
-x:element
name=context-root${dep.getProperty('ear.appxml.ear.context-root')}/x:element
+x:element
name=context-root${dep.getProperty('ear.appxml.war.context-root')}/x:element
/x:element
/x:element
/j:when
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/ear plugin.jelly
michal 2003/07/10 14:43:44
Modified:src/plugins-build/ear plugin.jelly
Log:
FIX for MAVEN-560 - Added support for RARs (JCA)
Revision ChangesPath
1.11 +9 -0 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 1 Jul 2003 14:57:57 - 1.10
+++ plugin.jelly 10 Jul 2003 21:43:44 - 1.11
@@ -78,6 +78,10 @@
j:set var=bundle value=true/
/j:if
+ j:if test=${dep.type == 'rar'}
+j:set var=bundle value=true/
+ /j:if
+
j:if test=${bundle}
ant:echoBundling: ${dep.type} - ${dep.id}/ant:echo
ant:fileset dir=${lib.file.parent}
@@ -156,6 +160,11 @@
j:when test=${dep.type=='jar'}
x:element name=module
x:element name=java${dep.getArtifact()}/x:element
+/x:element
+ /j:when
+ j:when test=${dep.type=='rar'}
+x:element name=module
+ x:element name=connector${dep.getArtifact()}/x:element
/x:element
/j:when
/j:choose
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/ear plugin.jelly
michal 2003/07/01 07:57:57
Modified:src/plugins-build/ear/xdocs goals.xml changes.xml
src/plugins-build/ear plugin.jelly
Log:
Fixes for MAVEN-518.
Artifact processing in the plugin was slightly changed and now it supports jar
overriding mechanism
Revision ChangesPath
1.3 +14 -3 maven/src/plugins-build/ear/xdocs/goals.xml
Index: goals.xml
===
RCS file: /home/cvs/maven/src/plugins-build/ear/xdocs/goals.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- goals.xml 8 May 2003 20:53:55 - 1.2
+++ goals.xml 1 Jul 2003 14:57:56 - 1.3
@@ -26,15 +26,26 @@
description
Installs the generated ear file into the local repository
/description
+ /goal
+ goal
+nameear:install-snapshot/name
+descriptionInstall the snapshot version of the ear in the local
repository/description
+ /goal
+ goal
+nameear:deploy/name
+descriptionDeploy the ear to the remote repository(ies)/description
/goal
-/goals
-
-goal
+ goal
+nameear:deploy-snapshot/name
+descriptionDeploy the snapshot version of the ear to the remote
repository(ies)/description
+ /goal
+ goal
nameear:generate-ear-descriptor/name
description
Generates application.xml
file based on information from POM
/description
/goal
+/goals
/body
/document
1.5 +8 -6 maven/src/plugins-build/ear/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven/src/plugins-build/ear/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 1 Jul 2003 08:45:14 - 1.4
+++ changes.xml 1 Jul 2003 14:57:56 - 1.5
@@ -6,16 +6,18 @@
/properties
body
release version=1.2 date=in CVS
- action dev=vmassol type=fix
-Removed warning about application.xml being added twice to the
-EAR.
- /action
action dev=michal type=fix
-Iterating artifacts not depedencies
+Fixes for MAVEN-518.
+Artifact processing in the plugin
+was slightly changed and now it supports jar overriding mechanism
/action
action dev=michal type=add
-Added deploy, deploy-snapshot and install-snapshot goals
+Added 'deploy', 'deploy-snapshot' and 'install-snapshot' goals
/action
+ action dev=vmassol type=fix
+Removed warning about application.xml being added twice to the
+EAR.
+ /action
/release
release version=1.1 date=2003-05-08
action dev=michal type=add
1.10 +35 -20maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 1 Jul 2003 08:45:13 - 1.9
+++ plugin.jelly 1 Jul 2003 14:57:57 - 1.10
@@ -52,25 +52,40 @@
j:forEach var=lib items=${pom.artifacts}
j:set var=dep value=${lib.dependency}/
j:if test=${dep.getProperty('ear.bundle')=='true'}
- ant:echoBundling: ${dep.type}/ant:echo
- j:choose
-j:when test=${dep.type == 'jar'}
- ant:fileset dir=${maven.repo.local}/${dep.artifactDirectory}/jars/
- ant:include name=${dep.artifact}/
- /ant:fileset
-/j:when
-j:when test=${dep.type == 'ear' }
- ant:fileset dir=${maven.repo.local}/${dep.artifactDirectory}/ears/
-ant:include name=${dep.artifact}/
- /ant:fileset
-/j:when
-j:when test=${dep.type == 'ejb' }
- ant:fileset dir=${maven.repo.local}/${dep.artifactDirectory}/ejbs/
-ant:include name=${dep.artifact}/
- /ant:fileset
-/j:when
- /j:choose
-/j:if
+
+ !--
+
+ We know that this dep wants to be bundled.
+ We should bundle only jars, wars and ejbs
+
+ --
+
+ !-- I want to have
+ j:if test=${dep.type == 'jar' or dep.type == 'war' or dep.type ==
'ejb'}
+ but jexl sucks so I have to write extra 10 lines...
+ --
+
+ j:set var=bundle value=false/
+ j:if
