PR: MPGENAPP-21

Make generated structure comply with maven standarts.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@366021 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-01-04 23:14:07 +00:00
parent 24a7a7e1f4
commit 1e010b37f0
145 changed files with 249 additions and 234 deletions

View File

@ -1,6 +1,7 @@
maven.xdoc.date=left
#cactus.src.mergewebxml = src/conf/cactus-web.xml
maven.eclipse.classpath.include=src/test-cactus
maven.docs.src=${basedir}/src/site/xdoc
#cactus.src.mergewebxml = src/main/config/cactus-web.xml
maven.eclipse.classpath.include=src/test-cactus/java
cactus.is.ear=true
#cactus.src=${basedir}../../../src/test-cactus
#cactus.src.dir=${basedir}../../../src/test-cactus

View File

@ -33,8 +33,9 @@
</dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<defaultGoal>ear</defaultGoal>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -45,7 +46,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -3,7 +3,7 @@ cactus.home.jboss3x=C:/j2ee/jboss-3.2.3_jetty-4.2.14
# Specify the XDoclet properties for the descriptor
maven.xdoclet.ejbdoclet.jboss.0=true
maven.xdoclet.ejbdoclet.jboss.0.Version=3.2
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge
maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table"
maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody"
maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="ejb">
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
<preGoal name="java:compile">
<attainGoal name="xdoclet:ejbdoclet" />
</preGoal>

View File

@ -1,11 +1,12 @@
maven.xdoc.date=left
maven.docs.src=${basedir}/src/site/xdoc
maven.ejb.src=${maven.build.dir}/xdoclet/ejb
maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus
maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus/java
maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true
maven.xdoclet.ejbdoclet.utilobject.0.includeGUID=true
maven.xdoclet.ejbdoclet.dataobject.0=true
maven.xdoclet.ejbdoclet.entityfacade.0=true
maven.xdoclet.ejbdoclet.valueobject.0=true
maven.xdoclet.ejbdoclet.deploymentdescriptor.0.validateXML=true
cactus.src.mergewebxml = src/conf/cactus-web.xml
cactus.src.mergewebxml = src/main/config/cactus-web.xml
cactus.is.ear=true

View File

@ -90,8 +90,9 @@
</dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<defaultGoal>ejb</defaultGoal>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -102,7 +103,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
<preGoal name="java:compile">
<mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
<attainGoal name="xdoclet:webdoclet" />

View File

@ -1,10 +1,11 @@
maven.xdoc.date=left
maven.eclipse.classpath.include=src/test-cactus
maven.docs.src=${basedir}/src/site/xdoc
maven.eclipse.classpath.include=src/test-cactus/java
maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
maven.xdoclet.webdoclet.0=true
maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.0.mergeDir=src/merge
maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
cactus.src.mergewebxml = src/conf/cactus-web.xml
cactus.src.mergewebxml = src/main/config/cactus-web.xml

View File

@ -123,8 +123,9 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<defaultGoal>war</defaultGoal>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -135,7 +136,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -15,6 +15,7 @@
# -------------------------------------------------------------------
maven.xdoc.date=left
maven.docs.src=${basedir}/src/site/xdoc
maven.ejb.src=${maven.build.dir}/xdoclet/ejb
maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus
maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true

View File

@ -165,8 +165,8 @@
<build>
<defaultGoal>ejb</defaultGoal>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -177,7 +177,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -14,7 +14,7 @@
# limitations under the License.
# -------------------------------------------------------------------
maven.genapp.repackage=java,test,test-cactus
maven.genapp.filter=project.xml,src/conf/cactus-web.xml
maven.genapp.repackage=main/java,test/java,test-cactus/java
maven.genapp.filter=project.xml,src/main/config/cactus-web.xml
maven.genapp.default.package=example.ejb

View File

@ -15,23 +15,24 @@
# -------------------------------------------------------------------
maven.xdoc.date=left
maven.eclipse.classpath.include=src/test-cactus,src/conf
maven.docs.src=${basedir}/src/site/xdoc
maven.eclipse.classpath.include=src/test-cactus/java,src/main/config
maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
maven.xdoclet.webdoclet.0=true
maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.0.mergeDir=src/merge
maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.strutsconfigxml.0=true
maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.strutsvalidationxml.0=true
maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.jbosswebxml.0=true
maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
maven.xdoclet.webdoclet.fileset.0.include=**/*.java
maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
cactus.src.mergewebxml = src/conf/cactus-web.xml
cactus.src.mergewebxml = src/main/config/cactus-web.xml

View File

@ -267,8 +267,8 @@
<build>
<defaultGoal>war</defaultGoal>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -279,7 +279,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -14,7 +14,7 @@
# limitations under the License.
# -------------------------------------------------------------------
maven.genapp.repackage=java,test,test-cactus
maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties
maven.genapp.repackage=main/java,test/java,test-cactus/java
maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties,project.properties
maven.genapp.default.package=example.web

View File

@ -17,7 +17,7 @@
*/
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
<preGoal name="java:compile">
<mkdir dir="target\xdoclet\webdoclet\WEB-INF" />
<attainGoal name="xdoclet:webdoclet" />

View File

@ -15,23 +15,24 @@
# -------------------------------------------------------------------
maven.xdoc.date=left
maven.eclipse.classpath.include=src/test-cactus,src/conf
maven.docs.src=${basedir}/src/site/xdoc
maven.eclipse.classpath.include=src/test-cactus/java,src/main/config
maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
maven.xdoclet.webdoclet.0=true
maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.0.mergeDir=src/merge
maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.strutsconfigxml.0=true
maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.strutsvalidationxml.0=true
maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.strutsvalidationxml.0.mergeDir=src/merge
maven.xdoclet.webdoclet.strutsvalidationxml.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.jbosswebxml.0=true
maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.fileset.0.include=**/*.java
maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
cactus.src.mergewebxml = src/conf/cactus-web.xml
cactus.src.mergewebxml = src/main/config/cactus-web.xml

View File

@ -265,9 +265,10 @@
</dependencies>
<build>
<defaultGoal>war</defaultGoal>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -278,7 +279,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -14,7 +14,7 @@
# limitations under the License.
# -------------------------------------------------------------------
maven.genapp.repackage=java,test,test-cactus
maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties
maven.genapp.repackage=main/java,test/java,test-cactus/java
maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties
maven.genapp.default.package=example.web

View File

@ -15,22 +15,23 @@
# -------------------------------------------------------------------
maven.xdoc.date=left
maven.eclipse.classpath.include=src/test-cactus,src/conf
maven.docs.src=${basedir}/src/site/xdoc
maven.eclipse.classpath.include=src/test-cactus/java,src/main/config
maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
maven.xdoclet.webdoclet.0=true
maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.0.mergeDir=src/merge
maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.strutsconfigxml.0=true
maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.strutsvalidationxml.0=true
maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.jbosswebxml.0=true
maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
maven.xdoclet.webdoclet.fileset.0.include=**/*.java
cactus.src.mergewebxml = src/conf/cactus-web.xml
cactus.src.mergewebxml = src/main/config/cactus-web.xml

View File

@ -249,8 +249,8 @@
<build>
<defaultGoal>war</defaultGoal>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -261,7 +261,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

View File

@ -14,7 +14,7 @@
# limitations under the License.
# -------------------------------------------------------------------
maven.genapp.repackage=java,test,test-cactus
maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties
maven.genapp.repackage=main/java,test/java,test-cactus/java
maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties,project.properties
maven.genapp.default.package=example.web

View File

@ -19,7 +19,7 @@ cactus.home.jboss3x=C:/j2ee/jboss-3.2.3_jetty-4.2.14
# Specify the XDoclet properties for the descriptor
maven.xdoclet.ejbdoclet.jboss.0=true
maven.xdoclet.ejbdoclet.jboss.0.Version=3.2
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge
maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table"
maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody"
maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF

View File

@ -19,7 +19,7 @@ cactus.home.tomcat5x=C:/program files/Apache Group/Tomcat 5.5
# Specify the XDoclet properties for the descriptor
maven.xdoclet.ejbdoclet.jboss.0=true
maven.xdoclet.ejbdoclet.jboss.0.Version=3.2
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge
maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table"
maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody"
maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF

View File

@ -15,14 +15,15 @@
# -------------------------------------------------------------------
maven.xdoc.date=left
maven.eclipse.classpath.include=src/test-cactus,src/conf
maven.docs.src=${basedir}/src/site/xdoc
maven.eclipse.classpath.include=src/test-cactus/java,src/main/config
maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
maven.xdoclet.webdoclet.0=true
maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.0.mergeDir=src/merge
maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.jbosswebxml.0=true
maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
maven.xdoclet.webdoclet.fileset.0.include=**/*.java
cactus.src.mergewebxml=src/conf/cactus-web.xml
cactus.src.mergewebxml=src/main/config/cactus-web.xml

View File

@ -276,8 +276,8 @@
<build>
<defaultGoal>war</defaultGoal>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@ -288,7 +288,7 @@
</unitTest>
<resources>
<resource>
<directory>src/conf</directory>
<directory>src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>

Some files were not shown because too many files have changed in this diff Show More